Merge branch 'master' into matthiaskrgr/unsealed

diff --cc scripts/model_crystals.shader
index 0000000000000000000000000000000000000000,140158057f85c405d53eb186744741c1ce40208f..5858752d1ecf1cd4e0177fbbfd9dec1bc29cb2f4
mode 000000,100644..100644
--- /dev/null
--- 2/scripts/model_crystals.shader
+++ b/scripts/model_crystals.shader
@@@ -1,0 -1,13 +1,26 @@@
+ models/crystals/crystal1
+ {
++<<<<<<< HEAD
++      dpmeshcollisions
+       dpglossintensitymod 5
+       dpglossexponentmod 2
++      surfaceparm alphashadow
++
++=======
++      dpglossintensitymod 5
++      dpglossexponentmod 2
++>>>>>>> master
+       dpreflectcube cubemaps/default/sky
+       {
+               map "models/crystals/crystal1"
+       }
+       {
+               map $lightmap
++<<<<<<< HEAD
++              blendfunc GL_DST_COLOR GL_ZERO
++              rgbGen identity
++=======
++>>>>>>> master
+       }
+ }
+ 

diff --cc scripts/shaderlist.txt
index a660936a2fced74b7f7b71e03d963a88ea5e6cf9,4d4aaf2be32d85d4ff52ed2a7e0850618d2d410b..65d306db8cc686e3ce951229b5f8bcbf184d8bf3
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -1,7 -1,5 +1,6 @@@
  alphamod
 +crystals
  common
- crystals
  decals
  effects_beam
  effects_forcefield