Merge branch 'master' into develop

lgsm/data/serverlist.csv

@@ -1,71 +1,71 @@
-arma3	arma3server	ARMA 3
-sdtd	sdtdserver	7 Days to Die
-ark	arkserver	ARK: Survival Evolved
-bo	boserver	Ballistic Overkill
-bf1942	bf1942server	Battlefield 1942
-bmdm	bmdmserver	Black Mesa: Deathmatch
-bs	bsserver	Blade Symphony
-bb2	bb2server	BrainBread 2
-cod	codserver	Call of Duty
-cod2	cod2server	Call of Duty 2
-cod4	cod4server	Call of Duty 4
-coduo	coduoserver	Call of Duty: United Offensive
-codwaw	codwawserver	Call of Duty: World at War
-cc	ccserver	Codename CURE
-cs	csserver	Counter-Strike 1.6
-cscz	csczserver	Counter-Strike: Condition Zero
-csgo	csgoserver	Counter-Strike: Global Offensive
-css	cssserver	Counter-Strike: Source
-dod	dodserver	Day of Defeat
-dods	dodsserver	Day of Defeat: Source
-doi	doiserver	Day of Infamy
-dmc	dmcserver	Deathmatch Classic
-dst	dstserver	Don't Starve Together
-dab	dabserver	Double Action: Boogaloo
-em	emserver	Empires Mod
-fctr	fctrserver	Factorio
-fof	fofserver	Fistful of Frags
-gmod	gmodserver	Garrys Mod
-ges	gesserver	GoldenEye: Source
-hl2dm	hl2dmserver	Half-Life 2: Deathmatch
-hldms	hldmsserver	Half-Life Deathmatch: Source
-hldm	hldmserver	Half-Life: Deathmatch
-hw	hwserver	Hurtworld
-ins	insserver	Insurgency
-jc2	jc2server	Just Cause 2
-kf	kfserver	Killing Floor
-kf2	kf2server	Killing Floor 2
-l4d	l4dserver	Left 4 Dead
-l4d2	l4d2server	Left 4 Dead 2
-mc	mcserver	Minecraft
-mta	mtaserver	Multi Theft Auto
-mumble	mumbleserver	Mumble
-ns2	ns2server	Natural Selection 2
-nmrih	nmrihserver	No More Room in Hell
-ns2c	ns2cserver	NS2: Combat
-opfor	opforserver	Opposing Force
-pvkii	pvkiiserver	Pirates Vikings & Knights II
-pc	pcserver	Project Cars
-pz	pzserver	Project Zomboid
-q2	q2server	Quake 2
-q3	q3server	Quake 3: Arena
-ql	qlserver	Quake Live
-qw	qwserver	Quake World
-ro	roserver	Red Orchestra: Ostfront 41-45
-ricochet	ricochetserver	Ricochet
-rust	rustserver	Rust
-ss3	ss3server	Serious Sam 3: BFE
-sb	sbserver	Starbound
-squad	squadserver	Squad
-sven	svenserver	Sven Co-op
-tf2	tf2server	Team Fortress 2
-tfc	tfcserver	Team Fortress Classic
-ts3	ts3server	Teamspeak 3
-tw	twserver	Teeworlds
-terraria	terrariaserver	Terraria
-tu	tuserver	Tower Unite
-ut2k4	ut2k4server	Unreal Tournament 2004
-ut3	ut3server	Unreal Tournament 3
-ut99	ut99server	Unreal Tournament 99
-wet	wetserver	Wolfenstein: Enemy Territory
-zps	zpsserver	Zombie Panic! Source
+arma3,arma3server,ARMA 3
+sdtd,sdtdserver,7 Days to Die
+ark,arkserver,ARK: Survival Evolved
+bo,boserver,Ballistic Overkill
+bf1942,bf1942server,Battlefield 1942
+bmdm,bmdmserver,Black Mesa: Deathmatch
+bs,bsserver,Blade Symphony
+bb2,bb2server,BrainBread 2
+cod,codserver,Call of Duty
+cod2,cod2server,Call of Duty 2
+cod4,cod4server,Call of Duty 4
+coduo,coduoserver,Call of Duty: United Offensive
+codwaw,codwawserver,Call of Duty: World at War
+cc,ccserver,Codename CURE
+cs,csserver,Counter-Strike 1.6
+cscz,csczserver,Counter-Strike: Condition Zero
+csgo,csgoserver,Counter-Strike: Global Offensive
+css,cssserver,Counter-Strike: Source
+dod,dodserver,Day of Defeat
+dods,dodsserver,Day of Defeat: Source
+doi,doiserver,Day of Infamy
+dmc,dmcserver,Deathmatch Classic
+dst,dstserver,Don't Starve Together
+dab,dabserver,Double Action: Boogaloo
+em,emserver,Empires Mod
+fctr,fctrserver,Factorio
+fof,fofserver,Fistful of Frags
+gmod,gmodserver,Garrys Mod
+ges,gesserver,GoldenEye: Source
+hl2dm,hl2dmserver,Half-Life 2: Deathmatch
+hldms,hldmsserver,Half-Life Deathmatch: Source
+hldm,hldmserver,Half-Life: Deathmatch
+hw,hwserver,Hurtworld
+ins,insserver,Insurgency
+jc2,jc2server,Just Cause 2
+kf,kfserver,Killing Floor
+kf2,kf2server,Killing Floor 2
+l4d,l4dserver,Left 4 Dead
+l4d2,l4d2server,Left 4 Dead 2
+mc,mcserver,Minecraft
+mta,mtaserver,Multi Theft Auto
+mumble,mumbleserver,Mumble
+ns2,ns2server,Natural Selection 2
+nmrih,nmrihserver,No More Room in Hell
+ns2c,ns2cserver,NS2: Combat
+opfor,opforserver,Opposing Force
+pvkii,pvkiiserver,Pirates Vikings & Knights II
+pc,pcserver,Project Cars
+pz,pzserver,Project Zomboid
+q2,q2server,Quake 2
+q3,q3server,Quake 3: Arena
+ql,qlserver,Quake Live
+qw,qwserver,Quake World
+ro,roserver,Red Orchestra: Ostfront 41-45
+ricochet,ricochetserver,Ricochet
+rust,rustserver,Rust
+ss3,ss3server,Serious Sam 3: BFE
+sb,sbserver,Starbound
+squad,squadserver,Squad
+sven,svenserver,Sven Co-op
+tf2,tf2server,Team Fortress 2
+tfc,tfcserver,Team Fortress Classic
+ts3,ts3server,Teamspeak 3
+tw,twserver,Teeworlds
+terraria,terrariaserver,Terraria
+tu,tuserver,Tower Unite
+ut2k4,ut2k4server,Unreal Tournament 2004
+ut3,ut3server,Unreal Tournament 3
+ut99,ut99server,Unreal Tournament 99
+wet,wetserver,Wolfenstein: Enemy Territory
+zps,zpsserver,Zombie Panic! Source

lgsm/functions/mods_list.sh

@@ -66,9 +66,9 @@ mod_info_advdupe2=( MOD "advdupe2" "Advanced Duplicator 2" "https://github.com/w
 mod_info_darkrp=( MOD "darkrp" "DarkRP" "https://github.com/FPtje/DarkRP/archive/master.zip" "darkrp-master.zip" "0" "LowercaseOn" "${systemdir}/gamemodes" "OVERWRITE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Most popular gamemode" )
 mod_info_darkrpmodification=( MOD "darkrpmodification" "DarkRP Modification" "https://github.com/FPtje/darkrpmodification/archive/master.zip" "darkrpmodification-master.zip" "0" "LowercaseOff" "${systemdir}/addons" "NOUPDATE" "ENGINES" "Garry's Mod;" "NOTGAMES" "http://darkrp.com" "Customize DarkRP settings" )
 # Oxidemod
-mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "https://dl.bintray.com/oxidemod/builds/Oxide-Rust.zip" "Oxide-Rust.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-rust.1659/" "Allows for the use of plugins" )
-mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "https://dl.bintray.com/oxidemod/builds/Oxide-Hurtworld.zip" "Oxide-Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-hurtworld.1332/" "Allows for the use of plugins" )
-mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "https://dl.bintray.com/oxidemod/builds/Oxide-SevenDays.zip" "Oxide-SevenDays.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-7-days-to-die.813/" "Allows for the use of plugins" )
+mod_info_rustoxide=( MOD "rustoxide" "Oxide for Rust" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-Rust.zip" "Oxide-Rust.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Rust;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-rust.1659/" "Allows for the use of plugins" )
+mod_info_hwoxide=( MOD "hwoxide" "Oxide for Hurtworld" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-Hurtworld.zip" "Oxide-Hurtworld.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "Hurtworld;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-hurtworld.1332/" "Allows for the use of plugins" )
+mod_info_sdtdoxide=( MOD "sdtdoxide" "Oxide for 7 Days To Die" "https://github.com/OxideMod/Oxide/releases/download/latest/Oxide-SevenDays.zip" "Oxide-SevenDays.zip" "0" "LowercaseOff" "${systemdir}" "OVERWRITE" "ENGINES" "7 Days To Die;" "NOTGAMES" "http://oxidemod.org/downloads/oxide-for-7-days-to-die.813/" "Allows for the use of plugins" )
 
 # REQUIRED: Set all mods info into the global array
 mods_global_array=( "${mod_info_metamod[@]}" "${mod_info_sourcemod[@]}" "${mod_info_ulib[@]}" "${mod_info_ulx[@]}" "${mod_info_utime[@]}" "${mod_info_uclip[@]}" "${mod_info_acf[@]}" "${mod_info_acf_missiles[@]}" "${mod_info_acf_sweps[@]}" "${mod_info_advdupe2[@]}" "${mod_info_darkrp[@]}" "${mod_info_darkrpmodification[@]}" "${mod_info_rustoxide[@]}" "${mod_info_hwoxide[@]}" "${mod_info_sdtdoxide[@]}" )