Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets

# Conflicts:
#	Models/Effects/CylinderShot.mesh
#	Models/Effects/CylinderShot.mtrl

Models/BushAlive.mtl

@@ -1,27 +0,0 @@
-newmtl UnitSize:UnitSize:initialShadingGroup
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-newmtl blinn1SG
-illum 4
-Kd 1.00 1.00 1.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-map_Kd ../Textures/FoliageDiff.png
-Ni 1.00
-Ks 0.00 0.00 0.00
-map_Ks ../Textures/FoliageSpec.png
-newmtl initialShadingGroup
-illum 4
-Kd 0.50 0.50 0.50
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00
-newmtl lambert3SG
-illum 4
-Kd 0.04 0.02 0.00
-Ka 0.00 0.00 0.00
-Tf 1.00 1.00 1.00
-Ni 1.00