Merge branch 'master' into Mario/monsters

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/Main.qc
index 86440f0db2e5d9e594732d8c52a5847109d8ee4c,42fadc0c18a86b0cc0cec1eb145409adebe08efb..6eef5cc0df53ddaa54e822b2332a179da52a9302
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -164,17 -115,7 +115,9 @@@ void CSQC_Init(void
        precache_model("null");
        precache_sound("misc/hit.wav");
        precache_sound("misc/typehit.wav");
-       if (autocvar_cl_precacheplayermodels)
-       {
-               precache_all_playermodels("models/player/*.zym");
-               precache_all_playermodels("models/player/*.dpm");
-               precache_all_playermodels("models/player/*.md3");
-               precache_all_playermodels("models/player/*.psk");
-               precache_all_playermodels("models/player/*.iqm");
-       }
  
 +      Monsters_Precache();
 +      generator_precache();
        Projectile_Precache();
        Hook_Precache();
        GibSplash_Precache();

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