From: drjaska <drjaska83@gmail.com>
Date: Tue, 25 Apr 2023 10:57:50 +0000 (+0300)
Subject: Merge branch 'master' into drjaska/balance/crylink
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=00ea8587f1983f09b07dfbb14f9bdf2ea0f04925;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into drjaska/balance/crylink
---

00ea8587f1983f09b07dfbb14f9bdf2ea0f04925
diff --cc .gitlab-ci.yml
index 1cfb5e30dd,8ba5c18061..f669332fa9
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -69,7 -75,7 +75,7 @@@ test_sv_game
      - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
      - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
  
-     - EXPECT=587abbff65c9a5fb372807e92f229875
 -    - EXPECT=fe5dec36cb304c55acee73afd1e09c0a
++    - EXPECT=e9b9647b7cb4ad97fd3322a6ea20c4b7
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
        | tee /dev/stderr
        | sed -e 's,^\[[^]]*\] ,,'