Merge branch 'master' into mirceakitsune/world_cubemaps

diff --combined scripts/shaderlist.txt
index 68284e9e799f5d7ab24294ce17e0a259a271deb4,e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77..c356050772c2a9e360b7f053fe3e3f17023776ba
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -1,5 -1,6 +1,6 @@@
  alphamod
  common
+ crystals
  decals
  effects_beam
  effects_forcefield
@@@ -11,7 -12,6 +12,7 @@@ effects_warpzon
  ex2x
  exomorphx
  exx
 +exx_reflections_off
  facility114invx
  facility114x
  glassx
@@@ -19,10 -19,12 +20,12 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
+ map_catharsis
  map_courtfun
  map_darkzone
  map_g-23
  map_glowplant
+ map_implosion
  map_leave_em_behind
  map_lightspeed
  map_newtonian-nightmare