Merge branch 'master' into Mario/electro_combo_over_time

diff --cc .gitlab-ci.yml
index 2d83b2906cf85acdd400a216d2bd59ba3cdb5ff9,3d2d310a028d30ddfd0dc7722d5af104bc25c70f..d27e6837e509bb1c0e8406a7009d00d46ac38f8d
--- 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=f42b46132cecd1a3516f6196ef8ece98
 -    - export EXPECT=82b429be1301d38fbe0af0c60511ceed
++    - export EXPECT=2fc7c0b22c9d397162e552a2e48256c3
      - 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 qcsrc/common/weapons/weapon/electro.qc
Simple merge

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