Merge remote branch 'origin/master' into diabolik/afterslime

diff --combined scripts/shaderlist.txt
index 7af4c7e541c02b5727adb1a866173abb835bb4b0,f89ac5dd13f57ae892d18bd98906300ec87d72cc..0498d03d9d95672193ae58cb2a7800fd31a566bb
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -13,10 -13,10 +13,11 @@@ facility114
  liquids_lava
  liquids_slime
  liquids_water
 +map_afterslime
  map_glowplant
  map_red-planet
  map_space-elevator
+ map_techassault
  map_stormkeep
  model_bigfan01
  model_desertfactory
@@@ -31,9 -31,10 +32,10 @@@ skies_exosyste
  skies_extragalactic
  skies_heaven
  skies_polluted_earth
+ stein1x
  techpanelx
  terrain01x
  trak4x
  trak5x
  trak6x
- trak7x
+ trak7x