From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 31 Aug 2010 20:24:59 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/mookow/shaderlist'
X-Git-Tag: xonotic-v0.1.0preview~151^2~30
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=7b21d30c173adf87a39e99c2c15a2b949a3f91f0;hp=fc61ce48603c3311622c155c282096e404180d78

Merge remote branch 'refs/remotes/origin/mookow/shaderlist'
---

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index b067ec2a..c252bcaf 100644
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,12 +1,24 @@
 common
 decals
-exosystem
-extragalactic
 exx
 ex2x
 facility114x
 facility114invx
+liquids_lava
+liquids_slime
+liquids_water
+model_bigfan01
+model_tree
+model_xonotic_jumppad01
+skies_calm_sea
+skies_distant_sunset
+skies_exosystem
+skies_exosystem2
+skies_extragalactic
+skies_heaven
+skies_polluted_earth
 trak4x
 trak5x
 terrain01x
 techpanelx
+warpzone