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 fd5f8f51921afbd225fd965842cf301f4b60326b..98600d9d2ff4384364d6af6c57fa63082b3e1c95 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,5 +1,6 @@
 alphamod
 common
+crystals
 decals
 effects_beam
 effects_forcefield
@@ -13,30 +14,32 @@ exomorphx
 exx
 facility114invx
 facility114x
+glassx
 liquids_lava
 liquids_slime
 liquids_water
 logos
+map_atelier
+map_catharsis
 map_courtfun
 map_darkzone
+map_erbium
 map_g-23
 map_glowplant
+map_implosion
 map_leave_em_behind
-map_lightspeed
-map_newtonian-nightmare
 map_oilrig
-map_red-planet
 map_silentsiege
 map_solarium
 map_space-elevator
 map_stormkeep
 map_techassault
+map_warfare
 map_xoylent
 metaltechx
 model_bigfan01
 model_crate02
 model_desertfactory
-model_lightspeed
 model_teleporters
 model_trak
 model_tree