From 8c16f4497086a81b5035406f81d24e331e524de7 Mon Sep 17 00:00:00 2001 From: malte0811 Date: Tue, 5 Jun 2018 20:26:44 +0200 Subject: [PATCH] Fixed some UV's, minor changes to the Marx generator texture --- build.gradle | 2 +- .../models/block/mech_mb/commutator.obj | 54 ++--- .../models/block/mech_mb/end.obj | 187 +++++++++++------- .../models/block/mech_mb/end_other.obj | 147 +++++++++----- .../models/block/mech_mb/shaft.mtl | 3 - .../models/block/mech_mb/shaft.obj | 72 +++---- .../models/block/mech_mb/shaft2.mtl | 3 - .../models/block/mech_mb/shaft2.obj | 74 ++++--- .../models/block/mech_mb/shaft4.mtl | 3 - .../models/block/mech_mb/shaft4.obj | 66 +++---- .../models/block/mech_mb/shaft_comm.mtl | 3 - .../models/block/mech_mb/shaft_comm.obj | 74 ++++--- .../models/block/mech_mb/shaft_comm4.obj | 50 ++--- .../textures/blocks/converter/shaft.png | Bin 556 -> 421 bytes .../industrialwires/textures/blocks/marx.png | Bin 11904 -> 11626 bytes 15 files changed, 391 insertions(+), 347 deletions(-) diff --git a/build.gradle b/build.gradle index 687c9aa..7b375b0 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ repositories { } dependencies { - compileOnly 'net.industrial-craft:industrialcraft-2:2.8.+' + deobfCompile 'net.industrial-craft:industrialcraft-2:2.8.+' deobfCompile "blusunrize:ImmersiveEngineering:0.12-+:deobf" compileOnly "TechReborn:TechReborn-1.12:2.6.+:dev" compileOnly "RebornCore:RebornCore-1.12:3.2.+:dev" diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj index aa06fbe..6061215 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/commutator.obj @@ -2,14 +2,14 @@ # www.blender.org mtllib commutator.mtl o Commutator_Cube.038 -v 0.125000 0.343750 0.625000 -v 0.125000 0.875000 0.625000 -v 0.000000 0.343750 0.625000 -v 0.000000 0.875000 0.625000 -v 0.125000 0.343750 0.375000 -v 0.125000 0.875000 0.375000 -v 0.000000 0.343750 0.375000 -v 0.000000 0.875000 0.375000 +v 0.125000 0.343750 0.500000 +v 0.125000 0.875000 0.500000 +v 0.000000 0.343750 0.500000 +v 0.000000 0.875000 0.500000 +v 0.125000 0.343750 0.250000 +v 0.125000 0.875000 0.250000 +v 0.000000 0.343750 0.250000 +v 0.000000 0.875000 0.250000 v 1.000000 0.875000 1.000000 v 1.000000 1.000000 1.000000 v 0.000000 0.875000 1.000000 @@ -18,30 +18,30 @@ v 1.000000 0.875000 0.000000 v 1.000000 1.000000 0.000000 v 0.000000 0.875000 0.000000 v 0.000000 1.000000 0.000000 -v 0.000000 0.406250 0.562500 -v 0.500000 0.406250 0.562500 -v 0.000000 0.593750 0.562500 -v 0.500000 0.593750 0.562500 v 0.000000 0.406250 0.437500 v 0.500000 0.406250 0.437500 v 0.000000 0.593750 0.437500 v 0.500000 0.593750 0.437500 +v 0.000000 0.406250 0.312500 +v 0.500000 0.406250 0.312500 +v 0.000000 0.593750 0.312500 +v 0.500000 0.593750 0.312500 +v 0.500000 0.406250 0.687500 +v 1.000000 0.406250 0.687500 +v 0.500000 0.593750 0.687500 +v 1.000000 0.593750 0.687500 v 0.500000 0.406250 0.562500 v 1.000000 0.406250 0.562500 v 0.500000 0.593750 0.562500 v 1.000000 0.593750 0.562500 -v 0.500000 0.406250 0.437500 -v 1.000000 0.406250 0.437500 -v 0.500000 0.593750 0.437500 -v 1.000000 0.593750 0.437500 -v 1.000000 0.343750 0.625000 -v 1.000000 0.875000 0.625000 -v 0.875000 0.343750 0.625000 -v 0.875000 0.875000 0.625000 -v 1.000000 0.343750 0.375000 -v 1.000000 0.875000 0.375000 -v 0.875000 0.343750 0.375000 -v 0.875000 0.875000 0.375000 +v 1.000000 0.343750 0.750000 +v 1.000000 0.875000 0.750000 +v 0.875000 0.343750 0.750000 +v 0.875000 0.875000 0.750000 +v 1.000000 0.343750 0.500000 +v 1.000000 0.875000 0.500000 +v 0.875000 0.343750 0.500000 +v 0.875000 0.875000 0.500000 vt 0.000000 0.541667 vt 0.166667 0.541667 vt 0.166667 0.583333 @@ -136,6 +136,10 @@ vt 0.000000 0.583333 vt 0.000000 0.583333 vt 0.041667 0.500000 vt 0.041667 0.583333 +vt 0.291667 0.666667 +vt 0.291667 0.583333 +vt 0.041667 0.666667 +vt 0.041667 0.583333 vn 0.0000 0.0000 1.0000 vn -1.0000 0.0000 0.0000 vn 0.0000 0.0000 -1.0000 @@ -167,3 +171,5 @@ f 35/80/2 36/81/2 40/82/2 39/83/2 f 39/84/3 40/85/3 38/86/3 37/87/3 f 37/88/4 38/89/4 34/90/4 33/91/4 f 35/92/5 39/84/5 37/93/5 33/94/5 +f 18/45/4 22/95/4 24/96/4 20/46/4 +f 27/97/2 31/68/2 29/71/2 25/98/2 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj index d211ca5..51a9fc8 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/end.obj @@ -1,70 +1,107 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org -mtllib end.mtl -o End.001_Cube.000 -v 0.000000 0.500000 0.750000 -v 0.000000 0.500000 0.250000 -v 1.000000 0.500000 0.750000 -v 1.000000 0.500000 0.250000 -v 0.853553 0.853553 0.750000 -v 0.853553 0.853554 0.250000 -v 0.500000 1.000000 0.750000 -v 0.500000 1.000000 0.250000 -v 0.146447 0.853553 0.750000 -v 0.146447 0.853554 0.250000 -v 1.000000 -1.000000 0.750000 -v 1.000000 0.500000 0.750000 -v 0.000000 -1.000000 0.750000 -v 0.000000 0.500000 0.750000 -v 1.000000 -1.000000 0.250000 -v 1.000000 0.500000 0.250000 -v 0.000000 -1.000000 0.250000 -v 0.000000 0.500000 0.250000 -v 0.500000 0.500000 0.750000 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.1250 0.4062 -vt 0.3750 0.4062 -vt 0.3750 0.5938 -vt 0.1250 0.5938 -vt 0.8750 0.5938 -vt 0.6250 0.5938 -vt 0.6250 0.4062 -vt 0.8750 0.4062 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.5000 0.0000 -vt 0.5000 0.7500 -vt 0.0000 0.7500 -vt -0.0000 0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 -0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 0.0000 -vt 0.0000 0.6250 -vt 0.0000 0.3750 -vt 0.5000 0.3750 -vt 0.5000 0.6250 -vt 0.4062 0.9375 -vt 0.0938 0.9375 -vt 0.2188 1.0000 -vt 0.0625 0.9375 -vt 0.5312 0.0000 -vt 1.0000 0.0000 -vt 1.0000 0.7500 -vt 0.5312 0.7500 -vt 0.5938 0.9375 -vt 0.5000 0.7500 -vt 0.9062 0.9375 -vt 0.7500 1.0000 +mtllib end_other.mtl +o End.001_Cube.003 +v 0.000000 0.500000 0.732759 +v 0.000000 0.500000 0.232759 +v 1.000000 0.500000 0.732759 +v 1.000000 0.500000 0.232759 +v 0.853553 0.853553 0.732759 +v 0.853553 0.853554 0.232759 +v 0.500000 1.000000 0.732759 +v 0.500000 1.000000 0.232759 +v 0.146447 0.853553 0.732759 +v 0.146447 0.853554 0.232759 +v 1.000000 -1.000000 0.732759 +v 1.000000 0.500000 0.732759 +v 0.000000 -1.000000 0.732759 +v 0.000000 0.500000 0.732759 +v 1.000000 -1.000000 0.232759 +v 1.000000 0.500000 0.232759 +v 0.000000 -1.000000 0.232759 +v 0.000000 0.500000 0.232759 +v 0.500000 0.500000 0.732759 +v 0.853553 0.853553 0.732759 +v 0.500000 1.000000 0.732759 +v 0.500000 1.000000 0.232759 +v 0.853553 0.853554 0.232759 +v 0.146447 0.853553 0.732759 +v 0.146447 0.853554 0.232759 +v 0.000000 0.500000 0.232759 +v 1.000000 0.500000 0.232759 +v 1.000000 0.500000 0.732759 +v 0.000000 0.500000 0.732759 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.125000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.125000 0.593750 +vt 0.875000 0.593750 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.875000 0.406250 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.500000 0.000000 +vt 0.500000 0.750000 +vt 0.000000 0.750000 +vt -0.000000 0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 -0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 0.000000 +vt 0.000000 0.625000 +vt 0.000000 0.375000 +vt 0.500000 0.375000 +vt 0.500000 0.625000 +vt 0.125000 0.593750 +vt 0.125000 0.406250 +vt 0.875000 0.406250 +vt 0.875000 0.593750 +vt 0.531250 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.750000 +vt 0.531250 0.750000 +vt 0.500000 0.750000 +vt 0.426777 0.926777 +vt 0.073223 0.926777 +vt -0.000000 0.750000 +vt 0.250000 1.000000 +vt 0.573223 0.926777 +vt 0.500000 0.750000 +vt 1.000000 0.750000 +vt 0.926777 0.926777 +vt 0.750000 1.000000 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.531250 0.750000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 vn 0.9239 0.3827 0.0000 vn 0.3827 0.9239 0.0000 vn -0.3827 0.9239 0.0000 @@ -83,8 +120,18 @@ f 17/17/5 18/18/5 16/19/5 15/20/5 f 13/21/6 14/22/6 18/23/6 17/24/6 f 15/25/7 16/26/7 12/27/7 11/28/7 f 13/29/8 17/30/8 15/31/8 11/32/8 -f 18/18/5 10/33/5 6/34/5 16/19/5 -f 8/35/5 6/36/5 10/33/5 +f 5/5/9 7/8/9 21/33/9 20/34/9 +f 7/9/9 9/12/9 24/35/9 21/36/9 f 13/37/9 11/38/9 12/39/9 14/40/9 -f 9/41/9 14/42/9 12/39/9 5/43/9 -f 5/43/9 7/44/9 9/41/9 +f 26/41/5 25/42/5 23/43/5 27/44/5 +f 22/45/5 23/43/5 25/42/5 +f 24/46/9 29/47/9 28/48/9 20/49/9 +f 20/49/9 21/50/9 24/46/9 +f 10/11/9 8/10/9 22/51/9 25/52/9 +f 8/7/9 6/6/9 23/53/9 22/54/9 +f 16/19/9 18/18/9 26/41/9 27/44/9 +f 14/40/9 12/39/9 28/48/9 29/55/9 +f 9/56/9 14/57/9 29/58/9 24/59/9 +f 18/60/9 10/61/9 25/62/9 26/63/9 +f 6/64/9 16/65/9 27/66/9 23/67/9 +f 12/68/9 5/69/9 20/70/9 28/71/9 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj index ef9a5c8..23c10de 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/end_other.obj @@ -1,6 +1,6 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org -mtllib end_other.mtl +mtllib end.mtl o End.000_Cube.001 v 1.000000 0.500000 0.250000 v 1.000000 0.500000 0.750000 @@ -21,50 +21,87 @@ v 0.000000 0.500000 0.750000 v 1.000000 -1.000000 0.750000 v 1.000000 0.500000 0.750000 v 0.500000 0.500000 0.250000 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.1250 0.4062 -vt 0.3750 0.4062 -vt 0.3750 0.5938 -vt 0.1250 0.5938 -vt 0.8750 0.5938 -vt 0.6250 0.5938 -vt 0.6250 0.4062 -vt 0.8750 0.4062 -vt 0.6250 0.6875 -vt 0.8750 0.6875 -vt 0.8750 0.8750 -vt 0.6250 0.8750 -vt 0.5000 0.0000 -vt 0.5000 0.7500 -vt 0.0000 0.7500 -vt -0.0000 0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 -0.0000 -vt 0.8750 0.0000 -vt 0.8750 0.7500 -vt 0.6250 0.7500 -vt 0.6250 0.0000 -vt 0.0000 0.6250 -vt 0.0000 0.3750 -vt 0.5000 0.3750 -vt 0.5000 0.6250 -vt 0.4062 0.9375 -vt 0.0938 0.9375 -vt 0.2188 1.0000 -vt 0.0625 0.9375 -vt 0.5312 0.0000 -vt 1.0000 0.0000 -vt 1.0000 0.7500 -vt 0.5312 0.7500 -vt 0.5938 0.9375 -vt 0.5000 0.7500 -vt 0.9062 0.9375 -vt 0.7500 1.0000 +v 0.146447 0.853553 0.250000 +v 0.500000 1.000000 0.250000 +v 0.500000 1.000000 0.750000 +v 0.146447 0.853554 0.750000 +v 0.853553 0.853553 0.250000 +v 0.853553 0.853554 0.750000 +v 1.000000 0.500000 0.750000 +v 0.000000 0.500000 0.750000 +v 0.000000 0.500000 0.250000 +v 1.000000 0.500000 0.250000 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.125000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.125000 0.593750 +vt 0.875000 0.593750 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.875000 0.406250 +vt 0.625000 0.687500 +vt 0.875000 0.687500 +vt 0.875000 0.875000 +vt 0.625000 0.875000 +vt 0.500000 0.000000 +vt 0.500000 0.750000 +vt 0.000000 0.750000 +vt -0.000000 0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 -0.000000 +vt 0.875000 0.000000 +vt 0.875000 0.750000 +vt 0.625000 0.750000 +vt 0.625000 0.000000 +vt 0.000000 0.625000 +vt 0.000000 0.375000 +vt 0.500000 0.375000 +vt 0.500000 0.625000 +vt 0.125000 0.593750 +vt 0.125000 0.406250 +vt 0.875000 0.406250 +vt 0.875000 0.593750 +vt 0.531250 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.750000 +vt 0.531250 0.750000 +vt 0.500000 0.750000 +vt 0.426777 0.926777 +vt 0.073223 0.926777 +vt -0.000000 0.750000 +vt 0.250000 1.000000 +vt 0.573223 0.926777 +vt 0.500000 0.750000 +vt 1.000000 0.750000 +vt 0.926777 0.926777 +vt 0.750000 1.000000 +vt 0.625000 0.593750 +vt 0.625000 0.406250 +vt 0.375000 0.406250 +vt 0.375000 0.593750 +vt 0.531250 0.750000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 +vt 0.000000 0.000000 vn -0.9239 0.3827 -0.0000 vn -0.3827 0.9239 -0.0000 vn 0.3827 0.9239 -0.0000 @@ -83,8 +120,18 @@ f 17/17/5 18/18/5 16/19/5 15/20/5 f 13/21/6 14/22/6 18/23/6 17/24/6 f 15/25/7 16/26/7 12/27/7 11/28/7 f 13/29/8 17/30/8 15/31/8 11/32/8 -f 18/18/5 10/33/5 6/34/5 16/19/5 -f 8/35/5 6/36/5 10/33/5 +f 5/5/5 7/8/5 21/33/5 20/34/5 +f 7/9/5 9/12/5 24/35/5 21/36/5 f 13/37/9 11/38/9 12/39/9 14/40/9 -f 9/41/9 14/42/9 12/39/9 5/43/9 -f 5/43/9 7/44/9 9/41/9 +f 26/41/5 25/42/5 23/43/5 27/44/5 +f 22/45/5 23/43/5 25/42/5 +f 24/46/9 29/47/9 28/48/9 20/49/9 +f 20/49/9 21/50/9 24/46/9 +f 10/11/5 8/10/5 22/51/5 25/52/5 +f 8/7/5 6/6/5 23/53/5 22/54/5 +f 16/19/5 18/18/5 26/41/5 27/44/5 +f 14/40/5 12/39/5 28/48/5 29/55/5 +f 9/56/5 14/57/5 29/58/5 24/59/5 +f 18/60/5 10/61/5 25/62/5 26/63/5 +f 6/64/5 16/65/5 27/66/5 23/67/5 +f 12/68/5 5/69/5 20/70/5 28/71/5 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj index d1d303a..908ab99 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft.obj @@ -1,4 +1,4 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft.mtl o Shaft_Cylinder.004 @@ -18,38 +18,30 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.1875 1.0000 -vt 0.1875 0.0000 -vt 0.2500 0.0000 -vt 0.2500 1.0000 -vt 0.1250 1.0000 -vt 0.1250 0.0000 -vt 0.1875 0.0000 -vt 0.1875 1.0000 -vt 0.0625 1.0000 -vt 0.0625 -0.0000 -vt 0.1250 -0.0000 -vt 0.1250 1.0000 -vt -0.0000 1.0000 -vt -0.0000 0.0000 -vt 0.0625 0.0000 -vt 0.0625 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.4375 1.0000 -vt 0.4375 0.0000 -vt 0.3750 1.0000 -vt 0.3750 0.0000 -vt 0.4375 0.0000 -vt 0.4375 1.0000 -vt 0.3125 1.0000 -vt 0.3125 0.0000 -vt 0.3750 0.0000 -vt 0.3750 1.0000 -vt 0.2500 1.0000 -vt 0.2500 0.0000 -vt 0.3125 0.0000 -vt 0.3125 1.0000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt -0.000000 1.000000 +vt -0.000000 -0.000000 +vt 0.062500 -0.000000 +vt 0.062500 1.000000 +vt 0.125000 -0.000000 +vt 0.125000 1.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 1.000000 +vt 0.187500 0.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 -0.000000 +vt 0.062500 -0.000000 +vt 0.062500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +52,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/13/5 10/14/5 12/15/5 11/16/5 +f 11/17/6 12/18/6 14/19/6 13/20/6 +f 13/21/7 14/22/7 16/23/7 15/24/7 +f 15/24/8 16/23/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj index 1ca377d..1d52b31 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft2.obj @@ -1,7 +1,7 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft2.mtl -o Shaft2_Cylinder.005 +o Shaft2_Cylinder.011 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -18,38 +18,30 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.0000 -vt 0.5000 1.0000 -vt 0.5000 -0.0000 -vt 0.5625 -0.0000 -vt 0.5625 1.0000 +vt 0.375000 1.000000 +vt 0.375000 0.000000 +vt 0.437500 0.000000 +vt 0.437500 1.000000 +vt 0.500000 0.000000 +vt 0.500000 1.000000 +vt 0.250000 1.000000 +vt 0.250000 0.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 +vt 0.375000 0.000000 +vt 0.375000 1.000000 +vt 0.437500 0.000000 +vt 0.437500 1.000000 +vt 0.375000 1.000000 +vt 0.375000 0.000000 +vt 0.437500 1.000000 +vt 0.437500 0.000000 +vt 0.500000 0.000000 +vt 0.500000 1.000000 +vt 0.250000 1.000000 +vt 0.250000 0.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +52,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/13/5 10/14/5 12/15/5 11/16/5 +f 11/17/6 12/18/6 14/19/6 13/20/6 +f 13/21/7 14/22/7 16/23/7 15/24/7 +f 15/24/8 16/23/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj index 3e5bacc..da367fa 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft4.obj @@ -1,7 +1,7 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft4.mtl -o Shaft4_Cylinder.003 +o Shaft4_Cylinder.010 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -18,34 +18,26 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.5625 1.0000 -vt 0.5625 -0.0000 -vt 0.6250 -0.0000 -vt 0.6250 1.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.6250 0.0000 -vt 0.6250 1.0000 -vt 0.6875 -0.0000 -vt 0.6875 1.0000 -vt 0.5625 1.0000 -vt 0.5625 -0.0000 -vt 0.6250 0.0000 -vt 0.6250 1.0000 -vt 0.6250 0.0000 -vt 0.6250 1.0000 -vt 0.5625 1.0000 -vt 0.5625 0.0000 -vt 0.5625 1.0000 -vt 0.5625 -0.0000 -vt 0.6250 -0.0000 -vt 0.6250 1.0000 -vt 0.6875 0.0000 -vt 0.6875 1.0000 -vt 0.6250 1.0000 -vt 0.6250 0.0000 -vt 0.6875 0.0000 -vt 0.6875 1.0000 +vt 0.625000 1.000000 +vt 0.625000 0.000000 +vt 0.687500 0.000000 +vt 0.687500 1.000000 +vt 0.750000 0.000000 +vt 0.750000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.562500 0.000000 +vt 0.562500 1.000000 +vt 0.625000 0.000000 +vt 0.625000 1.000000 +vt 0.687500 0.000000 +vt 0.687500 1.000000 +vt 0.750000 0.000000 +vt 0.750000 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.562500 0.000000 +vt 0.562500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -56,10 +48,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/8/3 6/7/3 8/9/3 7/10/3 -f 7/11/4 8/12/4 10/13/4 9/14/4 -f 9/15/5 10/16/5 12/17/5 11/18/5 -f 11/19/6 12/20/6 14/21/6 13/22/6 -f 13/22/7 14/21/7 16/23/7 15/24/7 -f 15/25/8 16/26/8 2/27/8 1/28/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/12/5 10/11/5 12/13/5 11/14/5 +f 11/14/6 12/13/6 14/15/6 13/16/6 +f 13/17/7 14/18/7 16/19/7 15/20/7 +f 15/20/8 16/19/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl index 24e1d41..98938da 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.mtl @@ -1,5 +1,2 @@ -# Blender MTL File: 'RotaryConverter.blend' -# Material Count: 1 - newmtl None map_Ka industrialwires:blocks/converter/shaft diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj index 7db6abb..1101ad3 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm.obj @@ -1,7 +1,7 @@ -# Blender v2.78 (sub 0) OBJ File: 'RotaryConverter.blend' +# Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft_comm.mtl -o ShaftComm_Cylinder.001 +o ShaftComm_Cylinder.006 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -18,38 +18,30 @@ v 0.551777 0.625000 1.000000 v 0.551777 0.625000 0.000000 v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 -vt 0.6875 1.0000 -vt 0.6875 0.0000 -vt 0.7500 -0.0000 -vt 0.7500 1.0000 -vt 0.1250 1.0000 -vt 0.1250 0.0000 -vt 0.1875 0.0000 -vt 0.1875 1.0000 -vt 0.0625 1.0000 -vt 0.0625 -0.0000 -vt 0.1250 -0.0000 -vt 0.1250 1.0000 -vt -0.0000 1.0000 -vt -0.0000 0.0000 -vt 0.0625 0.0000 -vt 0.0625 1.0000 -vt 0.7500 0.0000 -vt 0.7500 1.0000 -vt 0.6875 1.0000 -vt 0.6875 0.0000 -vt 0.3750 1.0000 -vt 0.3750 0.0000 -vt 0.4375 0.0000 -vt 0.4375 1.0000 -vt 0.3125 1.0000 -vt 0.3125 0.0000 -vt 0.3750 0.0000 -vt 0.3750 1.0000 -vt 0.2500 1.0000 -vt 0.2500 0.0000 -vt 0.3125 0.0000 -vt 0.3125 1.0000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 +vt -0.000000 1.000000 +vt -0.000000 0.000000 +vt 0.062500 0.000000 +vt 0.062500 1.000000 +vt 0.187500 0.000000 +vt 0.187500 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.187500 1.000000 +vt 0.187500 0.000000 +vt 0.250000 0.000000 +vt 0.250000 1.000000 +vt 0.312500 0.000000 +vt 0.312500 1.000000 +vt 0.062500 1.000000 +vt 0.062500 0.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +52,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/6/3 6/5/3 8/7/3 7/8/3 +f 7/9/4 8/10/4 10/11/4 9/12/4 +f 9/13/5 10/14/5 12/15/5 11/16/5 +f 11/17/6 12/18/6 14/19/6 13/20/6 +f 13/20/7 14/19/7 16/21/7 15/22/7 +f 15/23/8 16/24/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj index e0874e2..380049c 100644 --- a/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj +++ b/src/main/resources/assets/industrialwires/models/block/mech_mb/shaft_comm4.obj @@ -1,7 +1,7 @@ # Blender v2.79 (sub 0) OBJ File: 'RotaryConverter.blend' # www.blender.org mtllib shaft_comm4.mtl -o ShaftComm4_Cylinder.002 +o ShaftComm4_Cylinder.009 v 0.375000 0.551777 1.000000 v 0.375000 0.551777 0.000000 v 0.375000 0.448223 1.000000 @@ -20,36 +20,24 @@ v 0.448223 0.625000 1.000000 v 0.448223 0.625000 0.000000 vt 0.875000 1.000000 vt 0.875000 -0.000000 -vt 0.937500 0.000000 +vt 0.937500 -0.000000 vt 0.937500 1.000000 -vt 0.875000 0.000000 -vt 0.875000 1.000000 -vt 0.812500 1.000000 -vt 0.812500 0.000000 -vt 0.812500 1.000000 +vt 1.000000 -0.000000 +vt 1.000000 1.000000 +vt 0.750000 1.000000 +vt 0.750000 -0.000000 vt 0.812500 -0.000000 -vt 0.875000 0.000000 +vt 0.812500 1.000000 +vt 0.875000 -0.000000 vt 0.875000 1.000000 vt 0.937500 0.000000 vt 0.937500 1.000000 -vt 0.875000 1.000000 -vt 0.875000 0.000000 -vt 0.750000 1.000000 -vt 0.750000 0.000000 -vt 0.812500 0.000000 -vt 0.812500 1.000000 -vt 1.000000 0.000000 +vt 1.000000 -0.000000 vt 1.000000 1.000000 -vt 0.937500 1.000000 -vt 0.937500 0.000000 -vt 0.937500 1.000000 -vt 0.937500 0.000000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.812500 0.000000 -vt 0.812500 1.000000 vt 0.750000 1.000000 -vt 0.750000 0.000000 +vt 0.750000 -0.000000 +vt 0.812500 -0.000000 +vt 0.812500 1.000000 vn -1.0000 0.0000 0.0000 vn -0.7071 -0.7071 0.0000 vn 0.0000 -1.0000 0.0000 @@ -60,10 +48,10 @@ vn 0.0000 1.0000 0.0000 vn -0.7071 0.7071 0.0000 usemtl None f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/5/2 4/6/2 6/7/2 5/8/2 -f 5/9/3 6/10/3 8/11/3 7/12/3 -f 7/13/4 8/14/4 10/15/4 9/16/4 -f 9/17/5 10/18/5 12/19/5 11/20/5 -f 11/21/6 12/22/6 14/23/6 13/24/6 -f 13/25/7 14/26/7 16/27/7 15/28/7 -f 15/29/8 16/30/8 2/31/8 1/32/8 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/7/3 6/8/3 8/9/3 7/10/3 +f 7/10/4 8/9/4 10/11/4 9/12/4 +f 9/12/5 10/11/5 12/13/5 11/14/5 +f 11/14/6 12/13/6 14/15/6 13/16/6 +f 13/17/7 14/18/7 16/19/7 15/20/7 +f 15/20/8 16/19/8 2/2/8 1/1/8 diff --git a/src/main/resources/assets/industrialwires/textures/blocks/converter/shaft.png b/src/main/resources/assets/industrialwires/textures/blocks/converter/shaft.png index 459b14b6d85c4a6c2b58866ff7102abd4b5a111b..70ef4cf69a41bcd5e190e3be5a5e72d854be2619 100644 GIT binary patch delta 366 zcmV-!0g?W!1f>IzKz{}V5EUWtfG6Yt00BfvL_t(2&yA6>N&`U_k}kG^fC?r^&fMMZjKyA-v+=UkH$Oki%>Rol%ZxF3 zo>x^B$8jqwL}X?mgi?QaH0X7-TIAhC%cs}L_4}UJ6#!Uk5r2`0n*2O|OO5a|m~JDYwU&sKQi$Mn^gd<=fK6Bdfd2^qu8wvSEiJK$)b~#r_~dRj8uU)@ zX8@p_bBNg7n;1~QvT%W&>vpvA9?|djqbMqhf|;e1t&Dz9eM3!a#=+$cF%Wh$xF|1!J*FA(e@a^%z zA}zl6CtB7$5K&o{KED6?7rbUP9t#dk{Qv*} M07*qoM6N<$g1D-!$p8QV delta 502 zcmVS(fK{UDtJ8D+54TmZQ;VFc>)Js;bJeY&aZtU4Lib-!bMt>v{QLda%0$ zfVWRF06;|Vy&<9)qjQdkde*S<>)KgfPGgKB0stIiwAO|Y5V2D9(liYrhzKGgA^;c_ckKp%SC8fO{j-DJB{R?G^ZlF0F-B%K zM5NuT)v9Mi+<)F!E32-$y71l;k!4g@s3?jgNvyRxma;MC)A8yw-1@rQ+|R##S*#!Z z$<<<3eOlBr04M`Me#4504&%KyB4Uhj&S{adbMD!l>6^Xg>DKSV%SW1jetQN0#(VFa zQ=vV3?;qa1cXal1dt+^}SZLmL6*JR#JZ5Gcv}qb;5pVhU{py@{KL3h{*tRV*|LC^r zx;E-MGppaq8a7Rnrm0HRZx#_FA~8lH(pXvj?RQD@0Pv!iv515aLI_0Evli(t^?4$) sM6Ca+FJ9w!r=uiE0HTK0+V|6)zhj(AcK8TMy#N3J07*qoM6N<$f&u9HQvd(} diff --git a/src/main/resources/assets/industrialwires/textures/blocks/marx.png b/src/main/resources/assets/industrialwires/textures/blocks/marx.png index 749dcfee0bb91fad76a703aaa8f3f8348da7ada6..a7f324b88350bc4e9ac550eac8b3ef0f680e0d95 100644 GIT binary patch delta 11599 zcmV-VEwIvnUFuqpKMLXo1Q84~nfsN4kx4;+o-f#o_U?!#Cuu6ZP%3z

re73RcmJ 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 h