Merge branch 'master' into matthiaskrgr/unsealedtrial3

diff --cc scripts/crystals.shader
index 84af0d65f2f3160a9ef800e82de400eb2d8bc3ea,140158057f85c405d53eb186744741c1ce40208f..5858752d1ecf1cd4e0177fbbfd9dec1bc29cb2f4
mode 100644,100755..100644
--- 1/scripts/crystals.shader
--- 2/scripts/crystals.shader
+++ b/scripts/crystals.shader
@@@ -1,18 -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 e87b80c72d6d325081c34b90ab173fc2e591e878,4a3eff5ea82c187b55a94071d1a63ce34893e085..237d15fbbbedf294064434ae5a7d74349a76c558
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -1,6 -1,6 +1,7 @@@
  alphamod
 +crystals
  common
+ crystals
  decals
  effects_beam
  effects_forcefield