Merge branch 'master' into Mario/shockwave_removal

diff --cc .gitlab-ci.yml
index 7cde248f1fdab5b82a8086c6a618b44a1b611a91,81a98fa726d027248dc8ab60980dab69db86e279..7c4ae6a2b95508383fc803d97e7bf9a5c34f422f
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -36,7 -36,7 +36,7 @@@ test_compilation_units
  test_sv_game:
    stage: test
    script:
-     - export EXPECT=1dc3d94eb25b8a0c74192656297b08ef
 -    - export EXPECT=f5fbfbd04a22e781397cfd14db367419
++    - export EXPECT=601b58ab0baed5060eb18c8fc084e072
      - qcsrc/tools/sv_game-hashtest.sh
      - exit $?
  

diff --cc bal-wep-mario.cfg
Simple merge

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc xonotic-client.cfg
Simple merge