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 e925318423f2d67d134f52201d85438e31a6c64c..e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,5 +1,6 @@
 alphamod
 common
+crystals
 decals
 effects_beam
 effects_forcefield
@@ -13,31 +14,37 @@ exomorphx
 exx
 facility114invx
 facility114x
-grass
+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
 map_stormkeep
 map_techassault
 map_xoylent
-map_solarium
 metaltechx
 model_bigfan01
 model_crate02
 model_desertfactory
+model_lightspeed
 model_teleporters
 model_trak
 model_tree
 model_walker-static
 model_xonotic_jumppad01
-model_xoylent
 narmorx
 phillipk1x
 phillipk2x
@@ -57,5 +64,3 @@ trak4x
 trak5x
 trak6x
 trak7x
-
-