Merge branch 'master' into mirceakitsune/world_cubemaps

diff --combined scripts/shaderlist.txt
index 91c8ae41ce8eb03d046eadd1fdb9305e7c690b66,41176210c949d88b3589bd7732e8e61789153ec7..68284e9e799f5d7ab24294ce17e0a259a271deb4
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -11,9 -11,9 +11,10 @@@ effects_warpzon
  ex2x
  exomorphx
  exx
 +exx_reflections_off
  facility114invx
  facility114x
+ glassx
  liquids_lava
  liquids_slime
  liquids_water
@@@ -25,7 -25,8 +26,8 @@@ map_glowplan
  map_leave_em_behind
  map_lightspeed
  map_newtonian-nightmare
- map_red-planet
+ map_oilrig
+ map_silentsiege
  map_solarium
  map_space-elevator
  map_stormkeep