From c857418c157b4ce7754c53f38bcdf8af4501b274 Mon Sep 17 00:00:00 2001
From: Greelan <53196309+Greelan@users.noreply.github.com>
Date: Fri, 1 Jul 2022 09:26:16 +1000
Subject: [PATCH] Xonotic: updates for Stable 0.8.5 release

---
 xonoticconfig.json | 4 ++--
 xonoticserver.cfg  | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/xonoticconfig.json b/xonoticconfig.json
index 8689bc9..4fd5220 100755
--- a/xonoticconfig.json
+++ b/xonoticconfig.json
@@ -65,8 +65,8 @@
         "IsFlagArgument":false,
         "ParamFieldName":"",
         "IncludeInCommandLine":false,
-        "DefaultValue":"0.8.2",
-        "Placeholder":"0.8.2 | 20220528 | latest",
+        "DefaultValue":"0.8.5",
+        "Placeholder":"0.8.5 | 20220528 | latest",
         "EnumValues":{}
     },
     {
diff --git a/xonoticserver.cfg b/xonoticserver.cfg
index 803ea8b..5d9d426 100644
--- a/xonoticserver.cfg
+++ b/xonoticserver.cfg
@@ -154,9 +154,7 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 /////////////////////////////////////////////////////////////////////
 // Some more advanced settings.  You probably are not interested in changing them at all.
 
-//sv_ready_restart 0	// 1 to allow players to restart the map when all of them press the ready button
 //sv_ready_restart_after_countdown 0	// if set to 1 the players and map items are reset after the countdown ended, otherwise they're reset already at the beginning of the countdown
-//sv_ready_restart_repeatable 0	"allows the players to restart the game as often as needed
 //sv_autoscreenshot 0	// 1 will force a screenshot for all clients when the map ends.  Useful for competitions or the ladder.
 
 //g_antilag 2	// 0 to disable the antilag feature, 1 and 2 use different methods
@@ -164,6 +162,7 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 //sv_maxrate 1000000	// limits client connections to this rate in bytes/seconds
 
 //sys_ticrate 0.0333333	// 0.0166667 for twice as many server frames per second; smoother gameplay but somewhat higher CPU use.
+
 // see Docs/mapdownload.txt for more info
 //sv_curl_defaulturl http://www.xonotic.org/contentdownload/getmap.php?file=	//fallback download URL
 
@@ -195,8 +194,7 @@ sv_weaponstats_file "http://www.xonotic.org/weaponbalance/"
 /////////////////////////////////////////////////////////////////////
 // Overkill mod settings
 
-// To enable Overkill, put 'exec defaultOverkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.
-// You should also consider enabling 'g_fullbrightplayers 1'.
+// To enable Overkill, put 'exec ruleset-overkill.cfg' at the top of this file (above any other cvar changes), don't use 'g_overkill 1' directly.