Merge master, resolve a merge conflict

diff --cc scripts/map_erbium.shader
index 87720441620f11be1f1b4d9828bbbbd7002183af,bfd7a5e19cbf036b71ca8c6e74ed23d6609a5861..900c2ab486cf7ce2fef22ad3518f9affcea2c63a
--- 1/scripts/map_erbium.shader
--- 2/scripts/map_erbium.shader
+++ b/scripts/map_erbium.shader
@@@ -35,12 -33,12 +35,12 @@@ textures/map_erbium/fightingzon
  textures/map_erbium/large-turbine
  {
        qer_editorimage textures/map_erbium/large-turbine.jpg
 -      
 -      surfaceparm metalsteps
 -      q3map_bounceScale  1.5
 +
 +      q3map_bounceScale 1.5
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
 -      dpglossexponentmod  4
 +      dpglossexponentmod 4
  
 +      surfaceparm metalsteps
  
        {
                map textures/map_erbium/large-turbine.jpg
@@@ -56,12 -56,12 +56,12 @@@
  textures/map_erbium/metalic
  {
        qer_editorimage textures/map_erbium/metalic.jpg
 -      
 -      surfaceparm metalsteps
 -      q3map_bounceScale  1.5
 +
 +      q3map_bounceScale 1.5
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
 -      dpglossexponentmod  4
 +      dpglossexponentmod 4
  
 +      surfaceparm metalsteps
  
        {
                map textures/map_erbium/metalic.jpg
@@@ -77,12 -79,13 +77,12 @@@
  textures/map_erbium/pickup
  {
        qer_editorimage textures/map_erbium/pickup.jpg
 -      
 -      surfaceparm metalsteps
 -      q3map_bounceScale  1.5
 +
 +      q3map_bounceScale 1.5
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
 -      dpglossexponentmod  4
 +      dpglossexponentmod 4
  
 +      surfaceparm metalsteps
  
        {
                map textures/map_erbium/pickup.jpg
@@@ -98,12 -103,12 +98,12 @@@
  textures/map_erbium/metal-tiles
  {
        qer_editorimage textures/map_erbium/metal-tiles.jpg
 -      
 -      surfaceparm metalsteps
 -      q3map_bounceScale  1.5
 +
 +      q3map_bounceScale 1.5
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
 -      dpglossexponentmod  4
 +      dpglossexponentmod 4
  
 +      surfaceparm metalsteps
  
        {
                map textures/map_erbium/metal-tiles.jpg
@@@ -119,12 -126,12 +119,12 @@@
  textures/map_erbium/metal-rock-tiles
  {
        qer_editorimage textures/map_erbium/metal-rock-tiles.jpg
 -      
 -      surfaceparm metalsteps
 -      q3map_bounceScale  1.5
 +
 +      q3map_bounceScale 1.5
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
 -      dpglossexponentmod  4
 +      dpglossexponentmod 4
  
 +      surfaceparm metalsteps
  
        {
                map textures/map_erbium/metal-rock-tiles.jpg
@@@ -140,12 -149,13 +140,12 @@@
  textures/map_erbium/engine
  {
        qer_editorimage textures/map_erbium/engine.jpg
 -      
 -      surfaceparm metalsteps
 -      q3map_bounceScale  1.5
 +
 +      q3map_bounceScale 1.5
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
 -      dpglossexponentmod  4
 +      dpglossexponentmod 4
  
 +      surfaceparm metalsteps
  
        {
                map textures/map_erbium/engine.jpg
@@@ -181,11 -193,10 +181,11 @@@ textures/map_erbium/decal
  textures/map_erbium/tree-bark
  {
        qer_editorimage textures/map_erbium/tree-bark.jpg
 +
        dpoffsetmapping none
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
        dpglossexponentmod 4
 +
        {
                map textures/map_erbium/tree-bark.jpg
        }
@@@ -200,11 -211,9 +200,11 @@@
  textures/map_erbium/branches
  {
        qer_editorimage textures/map_erbium/branches.jpg
 +
        dpoffsetmapping none
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
        dpglossexponentmod 4
 +
        {
                map textures/map_erbium/branches.jpg
        }
@@@ -260,8 -268,8 +260,8 @@@ textures/map_erbium/fer
  {
        qer_editorimage textures/map_erbium/fern
  
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
 -      dpglossexponentmod  4
 +      dpglossexponentmod 4
        q3map_bouncescale 1.25
  
        surfaceparm trans
@@@ -285,10 -287,8 +285,10 @@@
  
  textures/map_erbium/ivy
  {
-       dpglossintensitymod 3
 +      qer_editorimage textures/map_erbium/ivy
 +
 -      dpglossexponentmod  4
+       dpglossintensitymod 1.5
 +      dpglossexponentmod 4
        q3map_bouncescale 1.25
  
        surfaceparm trans
@@@ -381,9 -355,8 +381,9 @@@ textures/map_erbium/singular-lea
  textures/map_erbium/black-tiles
  {
        qer_editorimage textures/map_erbium/black-tiles
 +
        dpoffsetmapping - .09346482113770383774 match8 106.75988500000000000000
-       dpglossintensitymod 1
+       dpglossintensitymod 0.5
        q3map_bouncescale 1.25
  
        {
@@@ -400,11 -375,12 +400,11 @@@
  textures/map_erbium/con-tiled
  {
        qer_editorimage textures/map_erbium/con-tiled.jpg
 -      
 -      q3map_bounceScale  0.5
 +
 +      q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 233
-       dpglossintensitymod 1
+       dpglossintensitymod 0.5
 -      dpglossexponentmod  1
 -
 +      dpglossexponentmod 1
  
        {
                map textures/map_erbium/con-tiled.jpg
@@@ -420,11 -398,13 +420,11 @@@
  textures/map_erbium/rock-grey
  {
        qer_editorimage textures/map_erbium/rock-grey.jpg
 -      
 -      q3map_bounceScale  0.5
 +
 +      q3map_bounceScale 0.5
        dpoffsetmapping - 2 match8 233
-       dpglossintensitymod 1
+       dpglossintensitymod 0.5
 -      dpglossexponentmod  1
 -
 +      dpglossexponentmod 1
  
        {
                map textures/map_erbium/rock-grey.jpg