Merge branch 'Lyberta/Survival' into Lyberta/master

diff --cc gamemodes-server.cfg
Simple merge

diff --cc mutators.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/modicons.qc
Simple merge

diff --cc qcsrc/menu/xonotic/keybinder.qc
index 9544cff94a90cee1b0c638350ee2d40a68adcd26,a14406bcec7202aa518df979bcb29f619f5c90a3..5d17a04d6f8c35410ec767429cfea50758089289
--- 1/qcsrc/menu/xonotic/keybinder.qc
--- 2/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@@ -33,9 -33,8 +33,9 @@@ void Xonotic_KeyBinds_Read(
        KEYBIND_DEF("+moveright"                            , _("strafe right"));
        KEYBIND_DEF("+jump"                                 , _("jump / swim"));
        KEYBIND_DEF("+crouch"                               , _("crouch / sink"));
 +      KEYBIND_DEF("+sprint"                               , _("sprint"));
        KEYBIND_DEF("+hook"                                 , _("off-hand hook"));
-       KEYBIND_DEF("+jetpack"                              , _("jet pack"));
+       KEYBIND_DEF("+jetpack"                              , _("jetpack"));
        KEYBIND_DEF(""                                      , "");
        KEYBIND_DEF(""                                      , _("Attacking"));
        KEYBIND_DEF("+fire"                                 , _("primary fire"));

diff --cc qcsrc/server/g_world.qc
Simple merge