From 36d3f7e4a373334413b0ce45b99780fcf9569b56 Mon Sep 17 00:00:00 2001
From: Daniel Amberson <tristaricjp@gmail.com>
Date: Fri, 28 Aug 2020 09:28:04 -0500
Subject: [PATCH] today was GREAT

thanks blockbench for auto uv'ing everything
---
 .../models/block/mechanical_crafter/item.json |  85 ++-
 .../models/block/mechanical_mixer/item.json   | 596 ++++++++++--------
 .../block/redstone_link/transmitter.json      |   1 +
 .../redstone_link/transmitter_powered.json    |   1 +
 .../create/models/block/water_wheel.json      |   2 +-
 5 files changed, 367 insertions(+), 318 deletions(-)

diff --git a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json
index 3bf0b3c52..4b839a69c 100644
--- a/src/main/resources/assets/create/models/block/mechanical_crafter/item.json
+++ b/src/main/resources/assets/create/models/block/mechanical_crafter/item.json
@@ -1,7 +1,6 @@
 {
 	"credit": "Made with Blockbench",
 	"parent": "create:block/large_wheels",
-	"texture_size": [32, 32],
 	"textures": {
 		"3": "create:block/crafter_thingies",
 		"4": "create:block/crafter_side",
@@ -17,12 +16,12 @@
 			"from": [0, 10, 0],
 			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"east": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"south": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"west": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"up": {"uv": [0, 0, 8, 8], "rotation": 270, "texture": "#6"},
-				"down": {"uv": [0, 0, 8, 8], "rotation": 90, "texture": "#7"}
+				"north": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"east": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"south": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"west": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#6"},
+				"down": {"uv": [0, 0, 16, 16], "rotation": 90, "texture": "#7"}
 			}
 		},
 		{
@@ -30,12 +29,12 @@
 			"from": [0, 0, 0],
 			"to": [16, 6, 16],
 			"faces": {
-				"north": {"uv": [0, 5, 8, 8], "texture": "#4"},
-				"east": {"uv": [0, 5, 8, 8], "texture": "#4"},
-				"south": {"uv": [0, 5, 8, 8], "texture": "#4"},
-				"west": {"uv": [0, 5, 8, 8], "texture": "#4"},
-				"up": {"uv": [0, 0, 8, 8], "texture": "#5"},
-				"down": {"uv": [0, 0, 8, 8], "texture": "#6"}
+				"north": {"uv": [0, 10, 16, 16], "texture": "#4"},
+				"east": {"uv": [0, 10, 16, 16], "texture": "#4"},
+				"south": {"uv": [0, 10, 16, 16], "texture": "#4"},
+				"west": {"uv": [0, 10, 16, 16], "texture": "#4"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#5"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#6"}
 			}
 		},
 		{
@@ -44,8 +43,8 @@
 			"to": [16, 10, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [24, 8, 8]},
 			"faces": {
-				"east": {"uv": [0, 3, 8, 5], "texture": "#4"},
-				"west": {"uv": [0, 3, 8, 5], "texture": "#4"}
+				"east": {"uv": [0, 6, 16, 10], "texture": "#4"},
+				"west": {"uv": [0, 3, 16, 7], "texture": "#4"}
 			}
 		},
 		{
@@ -54,8 +53,8 @@
 			"to": [0, 10, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [-8, 8, 8]},
 			"faces": {
-				"east": {"uv": [0, 3, 8, 5], "texture": "#4"},
-				"west": {"uv": [0, 3, 8, 5], "texture": "#4"}
+				"east": {"uv": [0, 3, 16, 7], "texture": "#4"},
+				"west": {"uv": [0, 6, 16, 10], "texture": "#4"}
 			}
 		},
 		{
@@ -64,8 +63,8 @@
 			"to": [16, 10, 0],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -8]},
 			"faces": {
-				"north": {"uv": [0, 3, 8, 5], "texture": "#4"},
-				"south": {"uv": [0, 3, 8, 5], "texture": "#4"}
+				"north": {"uv": [0, 6, 16, 10], "texture": "#4"},
+				"south": {"uv": [0, 3, 16, 7], "texture": "#4"}
 			}
 		},
 		{
@@ -74,8 +73,8 @@
 			"to": [16, 10, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 24]},
 			"faces": {
-				"north": {"uv": [0, 3, 8, 5], "texture": "#4"},
-				"south": {"uv": [0, 3, 8, 5], "texture": "#4"}
+				"north": {"uv": [0, 3, 16, 7], "texture": "#4"},
+				"south": {"uv": [0, 6, 16, 10], "texture": "#4"}
 			}
 		},
 		{
@@ -83,11 +82,11 @@
 			"from": [4, 16, 4],
 			"to": [5, 17, 12],
 			"faces": {
-				"north": {"uv": [4, 1, 4.5, 1.5], "texture": "#5"},
-				"east": {"uv": [2, 1, 6, 1.5], "texture": "#5"},
-				"south": {"uv": [3.5, 1, 4, 1.5], "texture": "#5"},
-				"west": {"uv": [2, 1, 6, 1.5], "texture": "#5"},
-				"up": {"uv": [1, 2, 1.5, 6], "texture": "#5"}
+				"north": {"uv": [4, 1, 5, 2], "texture": "#5"},
+				"east": {"uv": [2, 1, 10, 2], "texture": "#5"},
+				"south": {"uv": [3.5, 1, 4.5, 2], "texture": "#5"},
+				"west": {"uv": [2, 1, 10, 2], "texture": "#5"},
+				"up": {"uv": [1, 2, 2, 10], "texture": "#5"}
 			}
 		},
 		{
@@ -95,11 +94,11 @@
 			"from": [11, 16, 4],
 			"to": [12, 17, 12],
 			"faces": {
-				"north": {"uv": [4, 1, 4.5, 1.5], "texture": "#5"},
-				"east": {"uv": [2, 1, 6, 1.5], "texture": "#5"},
-				"south": {"uv": [3.5, 1, 4, 1.5], "texture": "#5"},
-				"west": {"uv": [2, 1, 6, 1.5], "texture": "#5"},
-				"up": {"uv": [1, 2, 1.5, 6], "texture": "#5"}
+				"north": {"uv": [4, 1, 5, 2], "texture": "#5"},
+				"east": {"uv": [2, 1, 10, 2], "texture": "#5"},
+				"south": {"uv": [3.5, 1, 4.5, 2], "texture": "#5"},
+				"west": {"uv": [2, 1, 10, 2], "texture": "#5"},
+				"up": {"uv": [1, 2, 2, 10], "texture": "#5"}
 			}
 		},
 		{
@@ -107,11 +106,11 @@
 			"from": [5, 16, 4],
 			"to": [11, 17, 5],
 			"faces": {
-				"north": {"uv": [3, 1, 6, 1.5], "texture": "#5"},
-				"east": {"uv": [1, 2, 1.5, 2.5], "texture": "#5"},
-				"south": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#5"},
-				"west": {"uv": [1, 2, 1.5, 2.5], "texture": "#5"},
-				"up": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#5"}
+				"north": {"uv": [3, 1, 9, 2], "texture": "#5"},
+				"east": {"uv": [1, 2, 2, 3], "texture": "#5"},
+				"south": {"uv": [2.5, 1, 8.5, 2], "texture": "#5"},
+				"west": {"uv": [1, 2, 2, 3], "texture": "#5"},
+				"up": {"uv": [2.5, 1, 8.5, 2], "texture": "#5"}
 			}
 		},
 		{
@@ -119,11 +118,11 @@
 			"from": [5, 16, 11],
 			"to": [11, 17, 12],
 			"faces": {
-				"north": {"uv": [3, 1, 6, 1.5], "texture": "#5"},
-				"east": {"uv": [1, 2, 1.5, 2.5], "texture": "#5"},
-				"south": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#5"},
-				"west": {"uv": [1, 2, 1.5, 2.5], "texture": "#5"},
-				"up": {"uv": [2.5, 1, 5.5, 1.5], "texture": "#5"}
+				"north": {"uv": [3, 1, 9, 2], "texture": "#5"},
+				"east": {"uv": [1, 2, 2, 3], "texture": "#5"},
+				"south": {"uv": [2.5, 1, 8.5, 2], "texture": "#5"},
+				"west": {"uv": [1, 2, 2, 3], "texture": "#5"},
+				"up": {"uv": [2.5, 1, 8.5, 2], "texture": "#5"}
 			}
 		},
 		{
@@ -131,7 +130,7 @@
 			"from": [5, 15.5, 5],
 			"to": [11, 16.5, 11],
 			"faces": {
-				"up": {"uv": [3, 0, 6, 3], "texture": "#3"}
+				"up": {"uv": [3, 0, 9, 6], "texture": "#3"}
 			}
 		},
 		{
@@ -139,7 +138,7 @@
 			"from": [5, 16, 5],
 			"to": [11, 17, 11],
 			"faces": {
-				"up": {"uv": [0, 0, 3, 3], "texture": "#3"}
+				"up": {"uv": [0, 0, 6, 6], "texture": "#3"}
 			}
 		},
 		{
diff --git a/src/main/resources/assets/create/models/block/mechanical_mixer/item.json b/src/main/resources/assets/create/models/block/mechanical_mixer/item.json
index 2e8a0c159..6451df90d 100644
--- a/src/main/resources/assets/create/models/block/mechanical_mixer/item.json
+++ b/src/main/resources/assets/create/models/block/mechanical_mixer/item.json
@@ -1,6 +1,6 @@
 {
 	"credit": "Made with Blockbench",
-	"parent": "create:block/large_wheels",
+	"parent": "block/block",
 	"ambientocclusion": false,
 	"texture_size": [32, 32],
 	"textures": {
@@ -8,256 +8,11 @@
 		"4": "create:block/mixer_base_side",
 		"6": "create:block/mixer_head",
 		"11": "create:block/mechanical_press_top",
-		"mechanical_press_pole": "create:block/mechanical_press_pole",
-		"particle": "create:block/cogwheel",
-		"1_2": "create:block/cogwheel"
+		"1_2": "create:block/cogwheel",
+		"particle": "create:block/stripped_spruce_log",
+		"mechanical_press_pole": "create:block/mechanical_press_pole"
 	},
 	"elements": [
-		{
-			"name": "MixerCenter",
-			"from": [7, -4.5, 7],
-			"to": [9, 7.5, 9],
-			"shade": false,
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#6"},
-				"east": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#6"},
-				"south": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#6"},
-				"west": {"uv": [0, 6, 6, 7], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [0, 6, 1, 7], "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixerbottom1",
-			"from": [2.5, -4, 7],
-			"to": [13.5, -2, 9],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [0, 7, 5.5, 8], "texture": "#6"},
-				"east": {"uv": [1, 4, 2, 5], "texture": "#6"},
-				"south": {"uv": [0, 7, 5.5, 8], "texture": "#6"},
-				"west": {"uv": [1, 0, 2, 1], "texture": "#6"},
-				"up": {"uv": [0, 6, 5.5, 7], "texture": "#6"},
-				"down": {"uv": [0, 5, 5.5, 6], "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixerbottom2",
-			"from": [7, -4, 2.5],
-			"to": [9, -2, 13.5],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [1, 4, 2, 5], "texture": "#6"},
-				"east": {"uv": [0, 7, 5.5, 8], "texture": "#6"},
-				"south": {"uv": [1, 4, 2, 5], "texture": "#6"},
-				"west": {"uv": [0, 7, 5.5, 8], "texture": "#6"},
-				"up": {"uv": [0, 6, 5.5, 7], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [0, 5, 5.5, 6], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixerside4",
-			"from": [11.5, -2, 7],
-			"to": [13.5, 4, 9],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [0, 1, 1, 4], "rotation": 180, "texture": "#6"},
-				"east": {"uv": [1, 1, 2, 4], "texture": "#6"},
-				"south": {"uv": [0, 1, 1, 4], "texture": "#6"},
-				"west": {"uv": [2, 0, 3, 3], "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixerside3",
-			"from": [2.5, -2, 7],
-			"to": [4.5, 4, 9],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [0, 1, 1, 4], "texture": "#6"},
-				"east": {"uv": [2, 0, 3, 3], "texture": "#6"},
-				"south": {"uv": [0, 1, 1, 4], "rotation": 180, "texture": "#6"},
-				"west": {"uv": [1, 1, 2, 4], "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixerside2",
-			"from": [7, -2, 2.5],
-			"to": [9, 4, 4.5],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [1, 1, 2, 4], "texture": "#6"},
-				"east": {"uv": [0, 1, 1, 4], "texture": "#6"},
-				"south": {"uv": [2, 0, 3, 3], "texture": "#6"},
-				"west": {"uv": [0, 1, 1, 4], "rotation": 180, "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixerside1",
-			"from": [7, -2, 11.5],
-			"to": [9, 4, 13.5],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [2, 0, 3, 3], "texture": "#6"},
-				"east": {"uv": [0, 1, 1, 4], "rotation": 180, "texture": "#6"},
-				"south": {"uv": [1, 1, 2, 4], "texture": "#6"},
-				"west": {"uv": [0, 1, 1, 4], "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixertop1",
-			"from": [7, 4, 2.5],
-			"to": [9, 6, 13.5],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [1, 0, 2, 1], "texture": "#6"},
-				"east": {"uv": [0, 7, 5.5, 8], "rotation": 180, "texture": "#6"},
-				"south": {"uv": [1, 0, 2, 1], "texture": "#6"},
-				"west": {"uv": [0, 7, 5.5, 8], "rotation": 180, "texture": "#6"},
-				"up": {"uv": [0, 5, 5.5, 6], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [0, 6, 5.5, 7], "rotation": 90, "texture": "#6"}
-			}
-		},
-		{
-			"name": "mixertop2",
-			"from": [2.5, 4, 7],
-			"to": [13.5, 6, 9],
-			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
-			"faces": {
-				"north": {"uv": [0, 7, 5.5, 8], "rotation": 180, "texture": "#6"},
-				"east": {"uv": [1, 0, 2, 1], "texture": "#6"},
-				"south": {"uv": [0, 7, 5.5, 8], "rotation": 180, "texture": "#6"},
-				"west": {"uv": [1, 0, 2, 1], "texture": "#6"},
-				"up": {"uv": [0, 5, 5.5, 6], "texture": "#6"},
-				"down": {"uv": [0, 6, 5.5, 7], "texture": "#6"}
-			}
-		},
-		{
-			"name": "polebase",
-			"from": [5, 7, 5],
-			"to": [11, 9, 11],
-			"shade": false,
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]},
-			"faces": {
-				"north": {"uv": [5, 3, 8, 4], "texture": "#6"},
-				"east": {"uv": [5, 3, 8, 4], "texture": "#6"},
-				"south": {"uv": [5, 3, 8, 4], "texture": "#6"},
-				"west": {"uv": [5, 3, 8, 4], "texture": "#6"},
-				"up": {"uv": [5, 0, 8, 3], "texture": "#6"},
-				"down": {"uv": [5, 0, 8, 3], "texture": "#6"}
-			}
-		},
-		{
-			"name": "Pole1Core",
-			"from": [6, 9, 6],
-			"to": [10, 19, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
-			"faces": {
-				"east": {"uv": [3, 3, 5, 8], "texture": "#mechanical_press_pole"},
-				"west": {"uv": [3, 3, 5, 8], "texture": "#mechanical_press_pole"},
-				"down": {"uv": [5.5, 0.5, 7.5, 2.5], "texture": "#mechanical_press_pole"}
-			}
-		},
-		{
-			"name": "Pole1Side",
-			"from": [5, 9, 5],
-			"to": [11, 19, 6],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
-			"faces": {
-				"north": {"uv": [0, 3, 3, 8], "texture": "#mechanical_press_pole"},
-				"east": {"uv": [0, 3, 0.5, 8], "texture": "#mechanical_press_pole"},
-				"south": {"uv": [0, 3, 3, 8], "texture": "#mechanical_press_pole"},
-				"west": {"uv": [2.5, 3, 3, 8], "texture": "#mechanical_press_pole"},
-				"down": {"uv": [5, 2.5, 8, 3], "texture": "#mechanical_press_pole"}
-			}
-		},
-		{
-			"name": "Pole1Side",
-			"from": [5, 9, 10],
-			"to": [11, 19, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
-			"faces": {
-				"north": {"uv": [0, 3, 3, 8], "texture": "#mechanical_press_pole"},
-				"east": {"uv": [0, 3, 0.5, 8], "texture": "#mechanical_press_pole"},
-				"south": {"uv": [0, 3, 3, 8], "texture": "#mechanical_press_pole"},
-				"west": {"uv": [2.5, 3, 3, 8], "texture": "#mechanical_press_pole"},
-				"down": {"uv": [5, 0, 8, 0.5], "texture": "#mechanical_press_pole"}
-			}
-		},
-		{
-			"name": "Pole2Core",
-			"from": [6, 19, 6],
-			"to": [10, 32, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]},
-			"faces": {
-				"east": {"uv": [3, 0, 5, 6.5], "texture": "#mechanical_press_pole"},
-				"west": {"uv": [3, 0, 5, 6.5], "texture": "#mechanical_press_pole"},
-				"up": {"uv": [5.5, 0.5, 7.5, 2.5], "rotation": 180, "texture": "#mechanical_press_pole"}
-			}
-		},
-		{
-			"name": "Pole2Side",
-			"from": [5, 19, 10],
-			"to": [11, 32, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 3, 6.5], "texture": "#mechanical_press_pole"},
-				"east": {"uv": [0, 0, 0.5, 6.5], "texture": "#mechanical_press_pole"},
-				"south": {"uv": [0, 0, 3, 6.5], "texture": "#mechanical_press_pole"},
-				"west": {"uv": [2.5, 0, 3, 6.5], "texture": "#mechanical_press_pole"},
-				"up": {"uv": [5, 0, 8, 0.5], "rotation": 180, "texture": "#mechanical_press_pole"}
-			}
-		},
-		{
-			"name": "Pole2Side",
-			"from": [5, 19, 5],
-			"to": [11, 32, 6],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 3, 6.5], "texture": "#mechanical_press_pole"},
-				"east": {"uv": [0, 0, 0.5, 6.5], "texture": "#mechanical_press_pole"},
-				"south": {"uv": [0, 0, 3, 6.5], "texture": "#mechanical_press_pole"},
-				"west": {"uv": [2.5, 0, 3, 6.5], "texture": "#mechanical_press_pole"},
-				"up": {"uv": [5, 2.5, 8, 3], "rotation": 180, "texture": "#mechanical_press_pole"}
-			}
-		},
-		{
-			"name": "Top",
-			"from": [0, 17, 0],
-			"to": [16, 23, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"east": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"south": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"west": {"uv": [0, 0, 8, 3], "texture": "#4"},
-				"up": {"uv": [0, 0, 8, 8], "texture": "#11"},
-				"down": {"uv": [0, 0, 8, 8], "texture": "#2"}
-			}
-		},
-		{
-			"name": "Bottom",
-			"from": [0, 9, 0],
-			"to": [16, 13, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"north": {"uv": [0, 5, 8, 7], "texture": "#4"},
-				"east": {"uv": [0, 5, 8, 7], "texture": "#4"},
-				"south": {"uv": [0, 5, 8, 7], "texture": "#4"},
-				"west": {"uv": [0, 5, 8, 7], "texture": "#4"},
-				"up": {"uv": [0, 0, 8, 8], "texture": "#2"},
-				"down": {"uv": [0, 0, 8, 8], "texture": "#11"}
-			}
-		},
-		{
-			"name": "Side2",
-			"from": [16, 13, 0],
-			"to": [16, 17, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
-			"faces": {
-				"east": {"uv": [0, 3, 8, 5], "texture": "#4"},
-				"west": {"uv": [0, 3, 8, 5], "texture": "#4"}
-			}
-		},
 		{
 			"name": "Gear",
 			"from": [-1, 13.5, 6.5],
@@ -341,50 +96,343 @@
 				"up": {"uv": [0, 0, 4, 4], "texture": "#1_2"},
 				"down": {"uv": [0, 0, 4, 4], "texture": "#1_2"}
 			}
+		},
+		{
+			"name": "Side3",
+			"from": [0, 13, 16],
+			"to": [16, 17, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"north": {"uv": [0, 6, 16, 10], "texture": "#4"},
+				"south": {"uv": [0, 6, 16, 10], "texture": "#4"}
+			}
+		},
+		{
+			"name": "Side4",
+			"from": [0, 13, 0],
+			"to": [16, 17, 0],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"north": {"uv": [0, 6, 16, 10], "texture": "#4"},
+				"south": {"uv": [0, 6, 16, 10], "texture": "#4"}
+			}
+		},
+		{
+			"name": "MixerCenter",
+			"from": [7, -4.5, 7],
+			"to": [9, 7.5, 9],
+			"shade": false,
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"},
+				"east": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"},
+				"south": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"},
+				"west": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#6"},
+				"down": {"uv": [0, 12, 2, 14], "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixerbottom1",
+			"from": [2.5, -4, 7],
+			"to": [13.5, -2, 9],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [0, 14, 11, 16], "texture": "#6"},
+				"east": {"uv": [2, 8, 4, 10], "texture": "#6"},
+				"south": {"uv": [0, 14, 11, 16], "texture": "#6"},
+				"west": {"uv": [2, 0, 4, 2], "texture": "#6"},
+				"up": {"uv": [0, 12, 11, 14], "texture": "#6"},
+				"down": {"uv": [0, 10, 11, 12], "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixerbottom2",
+			"from": [7, -4, 2.5],
+			"to": [9, -2, 13.5],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [2, 8, 4, 10], "texture": "#6"},
+				"east": {"uv": [0, 14, 11, 16], "texture": "#6"},
+				"south": {"uv": [2, 8, 4, 10], "texture": "#6"},
+				"west": {"uv": [0, 14, 11, 16], "texture": "#6"},
+				"up": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#6"},
+				"down": {"uv": [0, 10, 11, 12], "rotation": 90, "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixerside4",
+			"from": [11.5, -2, 7],
+			"to": [13.5, 4, 9],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
+				"east": {"uv": [2, 2, 4, 8], "texture": "#6"},
+				"south": {"uv": [0, 2, 2, 8], "texture": "#6"},
+				"west": {"uv": [4, 0, 6, 6], "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixerside3",
+			"from": [2.5, -2, 7],
+			"to": [4.5, 4, 9],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [0, 2, 2, 8], "texture": "#6"},
+				"east": {"uv": [4, 0, 6, 6], "texture": "#6"},
+				"south": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
+				"west": {"uv": [2, 2, 4, 8], "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixerside2",
+			"from": [7, -2, 2.5],
+			"to": [9, 4, 4.5],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [2, 2, 4, 8], "texture": "#6"},
+				"east": {"uv": [0, 2, 2, 8], "texture": "#6"},
+				"south": {"uv": [4, 0, 6, 6], "texture": "#6"},
+				"west": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixerside1",
+			"from": [7, -2, 11.5],
+			"to": [9, 4, 13.5],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [4, 0, 6, 6], "texture": "#6"},
+				"east": {"uv": [0, 2, 2, 8], "rotation": 180, "texture": "#6"},
+				"south": {"uv": [2, 2, 4, 8], "texture": "#6"},
+				"west": {"uv": [0, 2, 2, 8], "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixertop1",
+			"from": [7, 4, 2.5],
+			"to": [9, 6, 13.5],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [2, 0, 4, 2], "texture": "#6"},
+				"east": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
+				"south": {"uv": [2, 0, 4, 2], "texture": "#6"},
+				"west": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
+				"up": {"uv": [0, 10, 11, 12], "rotation": 90, "texture": "#6"},
+				"down": {"uv": [0, 12, 11, 14], "rotation": 90, "texture": "#6"}
+			}
+		},
+		{
+			"name": "mixertop2",
+			"from": [2.5, 4, 7],
+			"to": [13.5, 6, 9],
+			"rotation": {"angle": 22.5, "axis": "y", "origin": [8, 7, 8]},
+			"faces": {
+				"north": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
+				"east": {"uv": [2, 0, 4, 2], "texture": "#6"},
+				"south": {"uv": [0, 14, 11, 16], "rotation": 180, "texture": "#6"},
+				"west": {"uv": [2, 0, 4, 2], "texture": "#6"},
+				"up": {"uv": [0, 10, 11, 12], "texture": "#6"},
+				"down": {"uv": [0, 12, 11, 14], "texture": "#6"}
+			}
+		},
+		{
+			"name": "polebase",
+			"from": [5, 7, 5],
+			"to": [11, 9, 11],
+			"shade": false,
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]},
+			"faces": {
+				"north": {"uv": [10, 6, 16, 8], "texture": "#6"},
+				"east": {"uv": [10, 6, 16, 8], "texture": "#6"},
+				"south": {"uv": [10, 6, 16, 8], "texture": "#6"},
+				"west": {"uv": [10, 6, 16, 8], "texture": "#6"},
+				"up": {"uv": [10, 0, 16, 6], "texture": "#6"},
+				"down": {"uv": [10, 0, 16, 6], "texture": "#6"}
+			}
+		},
+		{
+			"name": "Pole1Core",
+			"from": [6, 9, 6],
+			"to": [10, 19, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
+			"faces": {
+				"east": {"uv": [6, 6, 10, 16], "texture": "#mechanical_press_pole"},
+				"west": {"uv": [6, 6, 10, 16], "texture": "#mechanical_press_pole"},
+				"down": {"uv": [11, 1, 15, 5], "texture": "#mechanical_press_pole"}
+			}
+		},
+		{
+			"name": "Pole1Side",
+			"from": [5, 9, 5],
+			"to": [11, 19, 6],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
+			"faces": {
+				"north": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"},
+				"east": {"uv": [0, 6, 1, 16], "texture": "#mechanical_press_pole"},
+				"south": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"},
+				"west": {"uv": [5, 6, 6, 16], "texture": "#mechanical_press_pole"},
+				"down": {"uv": [10, 5, 16, 6], "texture": "#mechanical_press_pole"}
+			}
+		},
+		{
+			"name": "Pole1Side",
+			"from": [5, 9, 10],
+			"to": [11, 19, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 8]},
+			"faces": {
+				"north": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"},
+				"east": {"uv": [0, 6, 1, 16], "texture": "#mechanical_press_pole"},
+				"south": {"uv": [0, 6, 6, 16], "texture": "#mechanical_press_pole"},
+				"west": {"uv": [5, 6, 6, 16], "texture": "#mechanical_press_pole"},
+				"down": {"uv": [10, 0, 16, 1], "texture": "#mechanical_press_pole"}
+			}
+		},
+		{
+			"name": "Pole2Core",
+			"from": [6, 19, 6],
+			"to": [10, 32, 10],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]},
+			"faces": {
+				"east": {"uv": [6, 0, 10, 13], "texture": "#mechanical_press_pole"},
+				"west": {"uv": [6, 0, 10, 13], "texture": "#mechanical_press_pole"},
+				"up": {"uv": [11, 1, 15, 5], "rotation": 180, "texture": "#mechanical_press_pole"}
+			}
+		},
+		{
+			"name": "Pole2Side",
+			"from": [5, 19, 10],
+			"to": [11, 32, 11],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]},
+			"faces": {
+				"north": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"},
+				"east": {"uv": [0, 0, 1, 13], "texture": "#mechanical_press_pole"},
+				"south": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"},
+				"west": {"uv": [5, 0, 6, 13], "texture": "#mechanical_press_pole"},
+				"up": {"uv": [10, 0, 16, 1], "rotation": 180, "texture": "#mechanical_press_pole"}
+			}
+		},
+		{
+			"name": "Pole2Side",
+			"from": [5, 19, 5],
+			"to": [11, 32, 6],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 8]},
+			"faces": {
+				"north": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"},
+				"east": {"uv": [0, 0, 1, 13], "texture": "#mechanical_press_pole"},
+				"south": {"uv": [0, 0, 6, 13], "texture": "#mechanical_press_pole"},
+				"west": {"uv": [5, 0, 6, 13], "texture": "#mechanical_press_pole"},
+				"up": {"uv": [10, 5, 16, 6], "rotation": 180, "texture": "#mechanical_press_pole"}
+			}
+		},
+		{
+			"name": "Top",
+			"from": [0, 17, 0],
+			"to": [16, 23, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"north": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"east": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"south": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"west": {"uv": [0, 0, 16, 6], "texture": "#4"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#11"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#2"}
+			}
+		},
+		{
+			"name": "Bottom",
+			"from": [0, 9, 0],
+			"to": [16, 13, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"north": {"uv": [0, 10, 16, 14], "texture": "#4"},
+				"east": {"uv": [0, 10, 16, 14], "texture": "#4"},
+				"south": {"uv": [0, 10, 16, 14], "texture": "#4"},
+				"west": {"uv": [0, 10, 16, 14], "texture": "#4"},
+				"up": {"uv": [0, 0, 16, 16], "texture": "#2"},
+				"down": {"uv": [0, 0, 16, 16], "texture": "#11"}
+			}
+		},
+		{
+			"name": "Side1",
+			"from": [0, 13, 0],
+			"to": [0, 17, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"east": {"uv": [0, 6, 16, 10], "texture": "#4"},
+				"west": {"uv": [0, 6, 16, 10], "texture": "#4"}
+			}
+		},
+		{
+			"name": "Side2",
+			"from": [16, 13, 0],
+			"to": [16, 17, 16],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 15, 8]},
+			"faces": {
+				"east": {"uv": [0, 6, 16, 10], "texture": "#4"},
+				"west": {"uv": [0, 6, 16, 10], "texture": "#4"}
+			}
 		}
 	],
 	"display": {
+		"thirdperson_righthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"thirdperson_lefthand": {
+			"rotation": [75, 45, 0],
+			"translation": [0, 2.5, 0],
+			"scale": [0.375, 0.375, 0.375]
+		},
+		"firstperson_righthand": {
+			"rotation": [0, 45, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"firstperson_lefthand": {
+			"rotation": [0, 225, 0],
+			"scale": [0.4, 0.4, 0.4]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.25, 0.25, 0.25]
+		},
 		"gui": {
 			"rotation": [30, 225, 0],
-			"translation": [0, -2, 0],
-			"scale": [0.45, 0.45, 0.45]
+			"translation": [0, -1.5, 0],
+			"scale": [0.4, 0.4, 0.4]
 		},
 		"fixed": {
-			"translation": [0, -2.75, -0.0625],
+			"translation": [0, -3, 0],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	},
-	"groups": [
+	"groups": [0, 1, 2, 3, 4, 5,
 		{
-			"name": "mixerhead",
+			"name": "item",
 			"origin": [8, 8, 8],
-			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8]
-		},
-		{
-			"name": "mechanical_press_head",
-			"origin": [8, 8, 8],
-			"children": [9, 10, 11, 12, 13, 14, 15]
-		},
-		{
-			"name": "mixer_base",
-			"origin": [8, 8, 8],
-			"children": [
+			"children": [6, 7,
 				{
-					"name": "cogwheel",
+					"name": "mixerhead",
 					"origin": [8, 8, 8],
-					"children": []
+					"children": [8, 9, 10, 11, 12, 13, 14, 15, 16]
 				},
 				{
-					"name": "mixerbase",
+					"name": "mechanical_press_head",
 					"origin": [8, 8, 8],
-					"children": [16, 17, 18]
+					"children": [17, 18, 19, 20, 21, 22, 23]
+				},
+				{
+					"name": "mixer_base",
+					"origin": [8, 8, 8],
+					"children": [
+						{
+							"name": "mixerbase",
+							"origin": [8, 8, 8],
+							"children": [24, 25, 26, 27]
+						}
+					]
 				}
 			]
-		},
-		{
-			"name": "cogwheel_shaftless",
-			"origin": [8, 8, 8],
-			"children": [19, 20, 21, 22, 23, 24]
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json
index 96de2ea5d..133eae26f 100644
--- a/src/main/resources/assets/create/models/block/redstone_link/transmitter.json
+++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter.json
@@ -3,6 +3,7 @@
 	"parent": "block/block",
 	"textures": {
 		"redstone_antenna": "create:block/redstone_antenna",
+		"particle": "create:block/redstone_bridge",
 		"redstone_bridge": "create:block/redstone_bridge"
 	},
 	"elements": [
diff --git a/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json b/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json
index 5c298639a..9cf06e461 100644
--- a/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json
+++ b/src/main/resources/assets/create/models/block/redstone_link/transmitter_powered.json
@@ -3,6 +3,7 @@
 	"parent": "block/block",
 	"textures": {
 		"redstone_antenna": "create:block/redstone_antenna_powered",
+		"particle": "create:block/redstone_bridge_powered",
 		"redstone_bridge": "create:block/redstone_bridge_powered"
 	},
 	"elements": [
diff --git a/src/main/resources/assets/create/models/block/water_wheel.json b/src/main/resources/assets/create/models/block/water_wheel.json
index 5ecab7479..bf661632e 100644
--- a/src/main/resources/assets/create/models/block/water_wheel.json
+++ b/src/main/resources/assets/create/models/block/water_wheel.json
@@ -7,7 +7,7 @@
 		"axis": "create:block/axis",
 		"axis_top": "create:block/axis_top",
 		"wheel": "create:block/wheel",
-		"particle": "create:block/stripped_spruce_log"
+		"particle": "block/stripped_spruce_log"
 	},
 	"elements": [
 		{