Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir into divVerent...

diff --combined scripts/shaderlist.txt
index 36e46eebe5a74733666139bdcb205674c388c034,f89ac5dd13f57ae892d18bd98906300ec87d72cc..f8311a97396cf966422aac6def58ab3b83346e87
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -13,10 -13,11 +13,12 @@@ facility114
  liquids_lava
  liquids_slime
  liquids_water
 +map_courtfun
  map_glowplant
  map_red-planet
  map_space-elevator
+ map_techassault
+ map_stormkeep
  model_bigfan01
  model_desertfactory
  model_tree
@@@ -30,7 -31,10 +32,10 @@@ skies_exosyste
  skies_extragalactic
  skies_heaven
  skies_polluted_earth
+ stein1x
  techpanelx
  terrain01x
  trak4x
  trak5x
+ trak6x
+ trak7x