Merge remote branch 'origin/savagex/techassault'

diff --combined scripts/shaderlist.txt
index 50610672faf138c1b52e3f3bfa8628764f093996,1422b067fac4115db3d1b6ef0e460d61c8a61305..f89ac5dd13f57ae892d18bd98906300ec87d72cc
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -16,6 -16,7 +16,7 @@@ liquids_wate
  map_glowplant
  map_red-planet
  map_space-elevator
+ map_techassault
  map_stormkeep
  model_bigfan01
  model_desertfactory
@@@ -30,10 -31,7 +31,10 @@@ skies_exosyste
  skies_extragalactic
  skies_heaven
  skies_polluted_earth
 +stein1x
  techpanelx
  terrain01x
  trak4x
  trak5x
- trak7x
 +trak6x
++trak7x