Merge branch 'master' into drjaska/spread-pattern

diff --cc .gitlab-ci.yml
index 5a3c7e770a7f89c53ebd78724ad6e1aec12294ea,fcb8cfbe05da5dae10b82bbc63ba083383e2efa4..ccb5e477a41fc53f7a72fa4eeadea0e323088c98
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,10 -75,9 +75,9 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
  \r
-     - EXPECT=62e1bd236de4e5be1195c63290d7fe81\r
-     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
 -    - EXPECT=27f38dfbbd72e4bf8f9b540882d5ccbe\r
++    - EXPECT=5077d03a22e17ce1b27b4401206beb95\r
+     - HASH=$(${ENGINE} +exec serverbench.cfg\r
        | tee /dev/stderr\r
-       | sed -e 's,^\[[^]]*\] ,,'\r
        | grep '^:'\r
        | grep -v '^:gamestart:'\r
        | grep -v '^:anticheat:'\r

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

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

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

diff --cc qcsrc/common/weapons/weapon/crylink.qc
Simple merge