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 98600d9d2ff4384364d6af6c57fa63082b3e1c95..5474ff34df4c7e4f537006d5884dcefc5bfa3e5e 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,6 +1,5 @@
 alphamod
 common
 alphamod
 common

-crystals

 decals
 effects_beam
 effects_forcefield
 decals
 effects_beam
 effects_forcefield


@@ -39,6 +38,7 @@ map_xoylent
 metaltechx
 model_bigfan01
 model_crate02
 metaltechx
 model_bigfan01
 model_crate02

+model_crystals

 model_desertfactory
 model_teleporters
 model_trak
 model_desertfactory
 model_teleporters
 model_trak