Merge remote-tracking branch 'origin/SD40-2'

TeamOpenIndustry · Apr 28, 2019 · 285b136 · 285b136
2 parents 47da9b4 + 7c38914
commit 285b136
Show file tree

Hide file tree

Showing 24 changed files with 289,033 additions and 275,834 deletions.
diff --git a/models/Crafting Machines/Plate Machine.blend b/models/Crafting Machines/Plate Machine.blend
diff --git a/models/Locomotives/Diesel/EMD SD40-2/EMD SD40-2.blend b/models/Locomotives/Diesel/EMD SD40-2/EMD SD40-2.blend
diff --git a/models/Locomotives/Diesel/EMD SD40-2/EMD SD40-2.blend1 b/models/Locomotives/Diesel/EMD SD40-2/EMD SD40-2.blend1
diff --git a/models/Locomotives/Diesel/EMD SD40-2/sd40-2.png b/models/Locomotives/Diesel/EMD SD40-2/sd40-2.png
diff --git a/models/Locomotives/Diesel/EMD SD70M/EMD SD70M.blend1 b/models/Locomotives/Diesel/EMD SD70M/EMD SD70M.blend1
diff --git a/models/Misc/Leveler.blend b/models/Misc/Leveler.blend
diff --git a/models/Misc/Leveler.blend1 b/models/Misc/Leveler.blend1
diff --git a/...ets/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/black2.png b/...ets/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/black2.png
diff --git a/...immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/brakestand.png b/...immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/brakestand.png
diff --git a/.../immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/cab_stand.png b/.../immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/cab_stand.png
diff --git a/...immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/cabstand01.png b/...immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/cabstand01.png
diff --git a/...ts/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/cabwall.png b/...ts/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/cabwall.png
diff --git a/...ets/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/chrome.png b/...ets/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/chrome.png
diff --git a/...es/assets/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/emd_sd40-2.mtl b/...es/assets/immersiverailroading/models/rolling_stock/locomotives/emd_sd40-2/emd_sd40-2.mtl
@@ -1,68 +1,16 @@
 # Blender MTL File: 'EMD SD40-2.blend'
-# Material Count: 14
+# Material Count: 8
 
-newmtl None
-Ns 0
-Ka 0.000000 0.000000 0.000000
-Kd 0.8 0.8 0.8
-Ks 0.8 0.8 0.8
-d 1
-illum 2
-
-newmtl black2.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd black2.png
-
-newmtl brakestand
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd brakestand.png
-
-newmtl cabstand01
+newmtl cab_stand_
 Ns 96.078431
 Ka 1.000000 1.000000 1.000000
 Kd 0.640000 0.640000 0.640000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
-map_Kd cabstand01.png
-
-newmtl cabwall
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd cabwall.png
-
-newmtl chrome.002
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.800000 0.800000 0.800000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd chrome.png
+illum 0
+map_Kd cab_stand.png
 
 newmtl gauge_air_emd
 Ns 96.078431
@@ -72,82 +20,71 @@ Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
+illum 0
 map_Kd gauge_air_emd.png
 
-newmtl gauge_amp_emd
+newmtl gauge_amp_alco
 Ns 96.078431
 Ka 1.000000 1.000000 1.000000
 Kd 0.640000 0.640000 0.640000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
-map_Kd gauge_amp_emd.png
+illum 0
+map_Kd gauge_amp_alco.png
 
-newmtl glass
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
-illum 2
-map_Kd glass.png
-
-newmtl metal
+newmtl gauge_amp_emd
 Ns 96.078431
 Ka 1.000000 1.000000 1.000000
 Kd 0.640000 0.640000 0.640000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
-map_Kd metal.png
+illum 0
+map_Kd gauge_amp_emd.png
 
-newmtl red
+newmtl glassconstant
 Ns 96.078431
 Ka 1.000000 1.000000 1.000000
 Kd 0.640000 0.640000 0.640000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
-map_Kd red.png
+illum 0
+map_Kd glassconstant.png
 
-newmtl rod01.001
+newmtl glassconstant_glassconstant.png
 Ns 96.078431
 Ka 1.000000 1.000000 1.000000
 Kd 0.640000 0.640000 0.640000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
-map_Kd rod01.png
+illum 0
+map_Kd glassconstant.png
 
-newmtl speedo_white_freight
+newmtl sd40-2
 Ns 96.078431
 Ka 1.000000 1.000000 1.000000
 Kd 0.640000 0.640000 0.640000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
-map_Kd speedo_white_freight.png
+illum 0
+map_Kd sd40-2.png
 
-newmtl standmount01
+newmtl sd40-2_sd40-2.png
 Ns 96.078431
 Ka 1.000000 1.000000 1.000000
 Kd 0.640000 0.640000 0.640000
 Ks 0.500000 0.500000 0.500000
 Ke 0.000000 0.000000 0.000000
 Ni 1.000000
 d 1.000000
-illum 2
-map_Kd standmount01.png
+illum 0
+map_Kd sd40-2.png