Merge branch 'master' into Justin/erbium

diff --combined scripts/shaderlist.txt
index 40b1a7d1ed151eacb41fd09bd81c77c7eb42f68b,1ab8c0ece645d29ec903330dd0fcb29556405552..98600d9d2ff4384364d6af6c57fa63082b3e1c95
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,10 -19,10 +19,11 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
+ map_atelier
  map_catharsis
  map_courtfun
  map_darkzone
 +map_erbium
  map_g-23
  map_glowplant
  map_implosion
@@@ -33,6 -33,7 +34,7 @@@ map_solariu
  map_space-elevator
  map_stormkeep
  map_techassault
+ map_warfare
  map_xoylent
  metaltechx
  model_bigfan01