Merge branch 'bones_was_here/805' into 'master'

Increase Xonotic version to 0.8.5

See merge request xonotic/xonotic-data.pk3dir!1034

diff --combined qcsrc/server/world.qc
index ebf53c38f80f88b71f104920f7f4ecf468d65a02,88aed86731647444d7ab27d5bfab22e41c98707c..41c9705da06f510026176c49d70f787505ad95fa
--- 1/qcsrc/server/world.qc
--- 2/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@@ -334,7 -334,6 +334,6 @@@ void cvar_changes_init(
                // does nothing gameplay relevant
                BADCVAR("captureleadlimit_override");
                BADCVAR("condump_stripcolors");
-               BADCVAR("gameversion");
                BADCVAR("fs_gamedir");
                BADCVAR("g_allow_oldvortexbeam");
                BADCVAR("g_balance_kill_delay");
@@@ -394,7 -393,7 +393,7 @@@
                BADCVAR("w_prop_interval");
                BADPREFIX("chat_");
                BADPREFIX("crypto_");
-               BADPREFIX("gameversion_");
+               BADPREFIX("gameversion");
                BADPREFIX("g_chat_");
                BADPREFIX("g_ctf_captimerecord_");
                BADPREFIX("g_hats_");
@@@ -518,6 -517,13 +517,6 @@@
                BADCVAR("g_grappling_hook");
                BADCVAR("g_jetpack");
  
 -              // temporary for testing
 -              // TODO remove before 0.8.3 release
 -              BADCVAR("g_ca_weaponarena");
 -              BADCVAR("g_freezetag_weaponarena");
 -              BADCVAR("g_lms_weaponarena");
 -              BADCVAR("g_ctf_stalemate_time");
 -
  #undef BADPRESUFFIX
  #undef BADPREFIX
  #undef BADCVAR