Merge branch 'master' into Mirio/implosion

[xonotic/xonotic-maps.pk3dir.git] / scripts / shaderlist.txt

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index ce08e64fa30fc21047b8ed20835efe99733f7fe8..e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,5 +1,6 @@
 alphamod
 common
+crystals
 decals
 effects_beam
 effects_forcefield
@@ -13,18 +14,21 @@ exomorphx
 exx
 facility114invx
 facility114x
+glassx
 liquids_lava
 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
-map_red-planet
+map_oilrig
 map_silentsiege
 map_solarium
 map_space-elevator