Merge branch 'master' into Justin/erbium

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

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 1ab8c0ece645d29ec903330dd0fcb29556405552..5474ff34df4c7e4f537006d5884dcefc5bfa3e5e 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,6 +1,5 @@
 alphamod
 common
-crystals
 decals
 effects_beam
 effects_forcefield
@@ -23,6 +22,7 @@ map_atelier
 map_catharsis
 map_courtfun
 map_darkzone
+map_erbium
 map_g-23
 map_glowplant
 map_implosion
@@ -38,6 +38,7 @@ map_xoylent
 metaltechx
 model_bigfan01
 model_crate02
+model_crystals
 model_desertfactory
 model_teleporters
 model_trak