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 e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77..5efb2a0551503cc5b4ef7d62321a2c6a58a80af5 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,6 +1,5 @@
 alphamod
 common
-crystals
 decals
 effects_beam
 effects_forcefield
@@ -19,27 +18,29 @@ liquids_lava
 liquids_slime
 liquids_water
 logos
+map_atelier
+map_boil
 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_silentsiege
 map_solarium
 map_space-elevator
 map_stormkeep
 map_techassault
+map_warfare
 map_xoylent
 metaltechx
 model_bigfan01
 model_crate02
+model_crystals
 model_desertfactory
-model_lightspeed
 model_teleporters
 model_trak
 model_tree