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

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

bf0086b0a0d8cada1b563b71ee35856f204665f9
diff --cc .gitlab-ci.yml
index 2ae0be7b2,478613507..1a6556a6e
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -75,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=87544a323c7c19ccdb403c730e9dedc5
 -    - EXPECT=f2226bf353b6ff3dd3c489a742ce4e6a
++    - EXPECT=9740715c065f303604ac48cd518e940f
      - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg
        | tee /dev/stderr
        | sed -e 's,^\[[^]]*\] ,,'