Merge branch 'master' into Mirio/implosion

diff --combined scripts/shaderlist.txt
index e6dcaf298c9c7c26af77a41ad3aba0079903c3a2,92398c428f4ce7d3f50a072b9cdc26885b8f60f5..e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77
--- 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
@@@ -18,11 -19,11 +19,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