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 c05cf399aa2d43e455b2be2871660e9cf9bfe366..98600d9d2ff4384364d6af6c57fa63082b3e1c95 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,4 +1,6 @@
+alphamod
 common
+crystals
 decals
 effects_beam
 effects_forcefield
@@ -8,31 +10,44 @@ effects_jumppad
 effects_lightning
 effects_warpzone
 ex2x
+exomorphx
 exx
 facility114invx
 facility114x
+glassx
 liquids_lava
 liquids_slime
 liquids_water
 logos
-map_afterslime
+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
+metaltechx
 model_bigfan01
 model_crate02
 model_desertfactory
 model_teleporters
+model_trak
 model_tree
 model_walker-static
 model_xonotic_jumppad01
-model_xoylent
 narmorx
+phillipk1x
+phillipk2x
 proceduralx
 screens
 skies_calm_sea