From: Mario <zacjardine@y7mail.com>
Date: Tue, 2 Dec 2014 02:31:42 +0000 (+1100)
Subject: Merge branch 'master' into Mirio/implosion
X-Git-Tag: xonotic-v0.8.0~15^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=c76383b26842da8523c484468062933d1b818be6;hp=-c

Merge branch 'master' into Mirio/implosion
---

c76383b26842da8523c484468062933d1b818be6
diff --combined scripts/shaderlist.txt
index e6dcaf29,92398c42..e6a748b2
--- a/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