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 24ac2cabd2fb5e4153d673027e3b66e20b059ee7..5474ff34df4c7e4f537006d5884dcefc5bfa3e5e 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -11,34 +11,40 @@ effects_warpzone
 ex2x
 exomorphx
 exx
-exx_reflections_off
 facility114invx
 facility114x
-grass
+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_newtonian-nightmare
-map_red-planet
+map_oilrig
+map_silentsiege
+map_solarium
 map_space-elevator
 map_stormkeep
 map_techassault
+map_warfare
 map_xoylent
-map_solarium
 metaltechx
 model_bigfan01
 model_crate02
+model_crystals
 model_desertfactory
 model_teleporters
 model_trak
 model_tree
 model_walker-static
 model_xonotic_jumppad01
-model_xoylent
 narmorx
 phillipk1x
 phillipk2x
@@ -58,5 +64,3 @@ trak4x
 trak5x
 trak6x
 trak7x
-
-