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 8970ec03c5e59a0dd7f9e7fc37fba77402772688..e6a748b2d0d8c4448692d22aaa17bfd14e8b2a77 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,4 +1,6 @@
+alphamod
 common
+crystals
 decals
 effects_beam
 effects_forcefield
@@ -12,15 +14,23 @@ exomorphx
 exx
 facility114invx
 facility114x
+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
@@ -29,13 +39,15 @@ 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
 proceduralx
 screens
 skies_calm_sea