From c4209a92ae0b6ecffa9f1feb6f85ca8f9f6e3d5a Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Sun, 7 May 2023 21:27:05 +0200
Subject: [PATCH] Tweak-a-boo

- Fixed z-fighting on the inner top face of scaffolds
- Added a ponder category for recently added/changed blocks
- Nudged a handful of item transforms
- Fixed offset shaft rotation on encased large cogwheels
---
 src/generated/resources/.cache/cache          |   2 +-
 .../resources/assets/create/lang/en_us.json   |   2 +
 .../BracketedKineticBlockEntityRenderer.java  |  19 +++---
 .../relays/encased/EncasedCogInstance.java    |   3 +
 .../relays/encased/EncasedCogRenderer.java    |  13 +++-
 .../filtering/FilteringBehaviour.java         |   3 +-
 .../create/foundation/ponder/PonderTag.java   |   9 ++-
 .../ponder/content/PonderIndex.java           |  13 ++++
 .../models/block/cart_assembler/block.json    |  38 ++++++-----
 .../block/cart_assembler/minecart_anchor.json |  64 ++++++++++--------
 .../block/contraption_controls/item.json      |   1 +
 .../create/models/block/controls/item.json    |   1 +
 .../models/block/creative_motor/item.json     |   6 +-
 .../models/block/large_water_wheel/item.json  |   2 +-
 .../block/redstone_link/transmitter.json      |  26 ++++++-
 .../create/models/block/scaffold/block.json   |  14 ++--
 .../textures/block/bearing_top_wooden.png     | Bin 444 -> 0 bytes
 .../textures/block/cart_assembler_side.png    | Bin 250 -> 323 bytes
 .../textures/block/cart_assembler_top.png     | Bin 443 -> 520 bytes
 19 files changed, 145 insertions(+), 71 deletions(-)
 delete mode 100644 src/main/resources/assets/create/textures/block/bearing_top_wooden.png

diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
index 76e8cc790..97a95c228 100644
--- a/src/generated/resources/.cache/cache
+++ b/src/generated/resources/.cache/cache
@@ -582,7 +582,7 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo
 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
 b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
 fcaad84ac4ebdb1e6d9301b77245ce855dbde503 assets/create/lang/en_ud.json
-988c876b2f101c2b02a27f00090d0d1348c01cc3 assets/create/lang/en_us.json
+03146c18c43580d65e41b94f3b9e1b3846768cc5 assets/create/lang/en_us.json
 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
 b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json
index ad3504295..1e7252e07 100644
--- a/src/generated/resources/assets/create/lang/en_us.json
+++ b/src/generated/resources/assets/create/lang/en_us.json
@@ -2186,6 +2186,8 @@
 	"create.ponder.tag.redstone.description": "Components which help with redstone engineering",
 	"create.ponder.tag.contraption_assembly": "Block Attachment Utility",
 	"create.ponder.tag.contraption_assembly.description": "Tools and Components used to assemble structures moved as an animated Contraption",
+	"create.ponder.tag.recently_updated": "Recently Updated",
+	"create.ponder.tag.recently_updated.description": "Components that have been added or changed significantly in the latest versions of Create",
 	"create.ponder.tag.fluids": "Fluid Manipulators",
 	"create.ponder.tag.fluids.description": "Components which help relaying and making use of Fluids",
 	"create.ponder.tag.decoration": "Aesthetics",
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java
index 3962ca079..5084a0bce 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/relays/elementary/BracketedKineticBlockEntityRenderer.java
@@ -24,8 +24,8 @@ public class BracketedKineticBlockEntityRenderer extends KineticBlockEntityRende
 	}
 
 	@Override
-	protected void renderSafe(BracketedKineticBlockEntity be, float partialTicks, PoseStack ms, MultiBufferSource buffer,
-		int light, int overlay) {
+	protected void renderSafe(BracketedKineticBlockEntity be, float partialTicks, PoseStack ms,
+		MultiBufferSource buffer, int light, int overlay) {
 
 		if (Backend.canUseInstancing(be.getLevel()))
 			return;
@@ -39,17 +39,12 @@ public class BracketedKineticBlockEntityRenderer extends KineticBlockEntityRende
 		// mesh properly
 
 		Axis axis = getRotationAxisOf(be);
-		BlockPos pos = be.getBlockPos();
-
 		Direction facing = Direction.fromAxisAndDirection(axis, AxisDirection.POSITIVE);
 		renderRotatingBuffer(be,
 			CachedBufferer.partialFacingVertical(AllPartialModels.SHAFTLESS_LARGE_COGWHEEL, be.getBlockState(), facing),
 			ms, buffer.getBuffer(RenderType.solid()), light);
 
-		float offset = getShaftAngleOffset(axis, pos);
-		float time = AnimationTickHolder.getRenderTime(be.getLevel());
-		float angle = ((time * be.getSpeed() * 3f / 10 + offset) % 360) / 180 * (float) Math.PI;
-
+		float angle = getAngleForLargeCogShaft(be, axis);
 		SuperByteBuffer shaft =
 			CachedBufferer.partialFacingVertical(AllPartialModels.COGWHEEL_SHAFT, be.getBlockState(), facing);
 		kineticRotationTransform(shaft, be, axis, angle, light);
@@ -57,6 +52,14 @@ public class BracketedKineticBlockEntityRenderer extends KineticBlockEntityRende
 
 	}
 
+	public static float getAngleForLargeCogShaft(SimpleKineticBlockEntity be, Axis axis) {
+		BlockPos pos = be.getBlockPos();
+		float offset = getShaftAngleOffset(axis, pos);
+		float time = AnimationTickHolder.getRenderTime(be.getLevel());
+		float angle = ((time * be.getSpeed() * 3f / 10 + offset) % 360) / 180 * (float) Math.PI;
+		return angle;
+	}
+
 	public static float getShaftAngleOffset(Axis axis, BlockPos pos) {
 		float offset = 0;
 		double d = (((axis == Axis.X) ? 0 : pos.getX()) + ((axis == Axis.Y) ? 0 : pos.getY())
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java
index 38ab029e7..f02553fc8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogInstance.java
@@ -14,6 +14,7 @@ import com.simibubi.create.content.contraptions.base.IRotate;
 import com.simibubi.create.content.contraptions.base.KineticBlockEntity;
 import com.simibubi.create.content.contraptions.base.KineticBlockEntityInstance;
 import com.simibubi.create.content.contraptions.base.flwdata.RotatingData;
+import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntityRenderer;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.core.Direction;
@@ -60,6 +61,8 @@ public class EncasedCogInstance extends KineticBlockEntityInstance<KineticBlockE
 				continue;
 			RotatingData data = setup(getRotatingMaterial().getModel(AllPartialModels.SHAFT_HALF, blockState, d)
 				.createInstance());
+			if (large)
+				data.setRotationOffset(BracketedKineticBlockEntityRenderer.getShaftAngleOffset(axis, pos));
 			if (d.getAxisDirection() == AxisDirection.POSITIVE)
 				rotatingTopShaft = Optional.of(data);
 			else
diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogRenderer.java
index 4814ead48..912c30024 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogRenderer.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/relays/encased/EncasedCogRenderer.java
@@ -5,6 +5,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllPartialModels;
 import com.simibubi.create.content.contraptions.base.IRotate;
 import com.simibubi.create.content.contraptions.base.KineticBlockEntityRenderer;
+import com.simibubi.create.content.contraptions.relays.elementary.BracketedKineticBlockEntityRenderer;
 import com.simibubi.create.content.contraptions.relays.elementary.SimpleKineticBlockEntity;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
@@ -13,7 +14,9 @@ import com.simibubi.create.foundation.utility.Iterate;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Direction.Axis;
 import net.minecraft.core.Direction.AxisDirection;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -48,11 +51,17 @@ public class EncasedCogRenderer extends KineticBlockEntityRenderer<SimpleKinetic
 			return;
 		IRotate def = (IRotate) block;
 
+		Axis axis = getRotationAxisOf(be);
+		BlockPos pos = be.getBlockPos();
+		float angle = large ? BracketedKineticBlockEntityRenderer.getAngleForLargeCogShaft(be, axis)
+			: getAngleForTe(be, pos, axis);
+
 		for (Direction d : Iterate.directionsInAxis(getRotationAxisOf(be))) {
 			if (!def.hasShaftTowards(be.getLevel(), be.getBlockPos(), blockState, d))
 				continue;
-			renderRotatingBuffer(be, CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, be.getBlockState(), d),
-				ms, buffer.getBuffer(RenderType.solid()), light);
+			SuperByteBuffer shaft = CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, be.getBlockState(), d);
+			kineticRotationTransform(shaft, be, axis, angle, light);
+			shaft.renderInto(ms, buffer.getBuffer(RenderType.solid()));
 		}
 	}
 
diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java
index d6e702da2..401737851 100644
--- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java
+++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringBehaviour.java
@@ -147,7 +147,8 @@ public class FilteringBehaviour extends BlockEntityBehaviour implements ValueSet
 		if (!filter.isEmpty() && !predicate.test(filter))
 			return false;
 		this.filter = filter;
-		count = Math.min(count, stack.getMaxStackSize());
+		if (!upTo)
+			count = Math.min(count, stack.getMaxStackSize());
 		callback.accept(filter);
 		blockEntity.setChanged();
 		blockEntity.sendData();
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java
index 3d3d5932a..2e55ae836 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderTag.java
@@ -79,6 +79,11 @@ public class PonderTag implements ScreenElement {
 			.defaultLang("Railway Equipment", "Components used in the construction or management of Train Contraptions")
 			.addToIndex(),
 
+		RECENTLY_UPDATED = create("recently_updated").item(AllBlocks.CLIPBOARD.get())
+			.defaultLang("Recent Changes",
+				"Components that have been added or changed significantly in the latest versions of Create")
+			.addToIndex(),
+
 		DISPLAY_SOURCES = create("display_sources").item(AllBlocks.DISPLAY_LINK.get(), true, false)
 			.item(AllBlocks.DISPLAY_LINK.get(), false, true)
 			.defaultLang("Sources for Display Links",
@@ -166,8 +171,8 @@ public class PonderTag implements ScreenElement {
 			ms.scale(0.25f, 0.25f, 1);
 			GuiComponent.blit(ms, 0, 0, 0, 0, 0, 64, 64, 64, 64);
 		} else if (!itemIcon.isEmpty()) {
-			ms.translate(-4, -4, 0);
-			ms.scale(1.5f, 1.5f, 1.5f);
+			ms.translate(-2, -2, 0);
+			ms.scale(1.25f, 1.25f, 1.25f);
 			GuiGameElement.of(itemIcon)
 				.render(ms);
 		}
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java
index 2ad9e4cb0..f55d23d7f 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java
@@ -368,6 +368,19 @@ public class PonderIndex {
 	public static void registerTags() {
 		// Add items to tags here
 
+		PonderRegistry.TAGS.forTag(PonderTag.RECENTLY_UPDATED)
+			.add(AllBlocks.WATER_WHEEL)
+			.add(AllBlocks.LARGE_WATER_WHEEL)
+			.add(AllBlocks.ELEVATOR_PULLEY)
+			.add(AllBlocks.CONTRAPTION_CONTROLS)
+			.add(AllBlocks.MECHANICAL_ROLLER)
+			.add(AllBlocks.MECHANICAL_PUMP)
+			.add(AllBlocks.SMART_OBSERVER)
+			.add(AllBlocks.THRESHOLD_SWITCH)
+			.add(AllItems.NETHERITE_BACKTANK)
+			.add(AllBlocks.COPYCAT_PANEL)
+			.add(AllBlocks.COPYCAT_STEP);
+
 		PonderRegistry.TAGS.forTag(PonderTag.KINETIC_RELAYS)
 			.add(AllBlocks.SHAFT)
 			.add(AllBlocks.COGWHEEL)
diff --git a/src/main/resources/assets/create/models/block/cart_assembler/block.json b/src/main/resources/assets/create/models/block/cart_assembler/block.json
index c57969a30..bc1988edf 100644
--- a/src/main/resources/assets/create/models/block/cart_assembler/block.json
+++ b/src/main/resources/assets/create/models/block/cart_assembler/block.json
@@ -21,28 +21,30 @@
 		},
 		{
 			"name": "Side",
-			"from": [13.875, 0.062, 1.125],
-			"to": [17.875, 13.937, 14.875],
+			"from": [-2.05, -0.05, 0.95],
+			"to": [2, 14.05, 15.05],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
-				"north": {"uv": [1, 14.875, 5, 1], "texture": "#6"},
-				"east": {"uv": [1, 15, 15, 1], "rotation": 180, "texture": "#6"},
-				"south": {"uv": [11, 14.875, 15, 1], "texture": "#6"},
-				"west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#translation_chassis_side"},
-				"up": {"uv": [1, 5, 14.75, 1], "rotation": 270, "texture": "#6"},
-				"down": {"uv": [1, 15, 14.75, 11], "rotation": 90, "texture": "#6"}
+				"north": {"uv": [11, 15, 15, 1], "texture": "#6"},
+				"east": {"uv": [1, 15, 15, 1], "rotation": 90, "texture": "#translation_chassis_side"},
+				"south": {"uv": [1, 15, 5, 1], "texture": "#6"},
+				"west": {"uv": [1, 15, 15, 1], "rotation": 180, "texture": "#6"},
+				"up": {"uv": [15, 5, 1, 1], "rotation": 90, "texture": "#6"},
+				"down": {"uv": [1, 15, 15, 11], "rotation": 270, "texture": "#6"}
 			}
 		},
 		{
 			"name": "Side",
-			"from": [-1.875, 0.062, 1.125],
-			"to": [2.125, 13.937, 14.875],
+			"from": [14, -0.05, 0.95],
+			"to": [18.05, 14.05, 15.05],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]},
 			"faces": {
-				"north": {"uv": [11, 14.875, 15, 1], "texture": "#6"},
-				"east": {"uv": [1, 15, 15, 1], "rotation": 90, "texture": "#translation_chassis_side"},
-				"south": {"uv": [1, 14.875, 5, 1], "texture": "#6"},
-				"west": {"uv": [1, 15, 15, 1], "rotation": 180, "texture": "#6"},
-				"up": {"uv": [1, 5, 14.75, 1], "rotation": 90, "texture": "#6"},
-				"down": {"uv": [1, 15, 14.75, 11], "rotation": 270, "texture": "#6"}
+				"north": {"uv": [15, 15, 11, 1], "texture": "#6"},
+				"east": {"uv": [15, 15, 1, 1], "rotation": 180, "texture": "#6"},
+				"south": {"uv": [5, 15, 1, 1], "texture": "#6"},
+				"west": {"uv": [1, 1, 15, 15], "rotation": 90, "texture": "#translation_chassis_side"},
+				"up": {"uv": [15, 1, 1, 5], "rotation": 90, "texture": "#6"},
+				"down": {"uv": [1, 11, 15, 15], "rotation": 270, "texture": "#6"}
 			}
 		},
 		{
@@ -50,9 +52,9 @@
 			"to": [16, 16, 16],
 			"rotation": {"angle": 0, "axis": "y", "origin": [8, 23, 8]},
 			"faces": {
-				"north": {"uv": [0, 0, 16, 4], "texture": "#translation_chassis_side"},
+				"north": {"uv": [0, 0, 16, 4], "texture": "#5"},
 				"east": {"uv": [0, 0, 16, 4], "texture": "#5"},
-				"south": {"uv": [0, 0, 16, 4], "texture": "#translation_chassis_side"},
+				"south": {"uv": [0, 0, 16, 4], "texture": "#5"},
 				"west": {"uv": [0, 0, 16, 4], "texture": "#5"},
 				"up": {"uv": [0, 0, 16, 16], "texture": "#4"},
 				"down": {"uv": [0, 0, 16, 16], "texture": "#translation_chassis_side"}
diff --git a/src/main/resources/assets/create/models/block/cart_assembler/minecart_anchor.json b/src/main/resources/assets/create/models/block/cart_assembler/minecart_anchor.json
index 6be0bc082..43ad533a0 100644
--- a/src/main/resources/assets/create/models/block/cart_assembler/minecart_anchor.json
+++ b/src/main/resources/assets/create/models/block/cart_assembler/minecart_anchor.json
@@ -1,32 +1,36 @@
 {
-    "__comment": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
-    "textures": {
-        "translation_chassis_side": "create:block/cart_assembler_side"
-    },
-    "elements": [
-        {
-            "name": "Top",
-            "from": [ 0, 12, 0 ], 
-            "to": [ 16, 16, 16 ], 
-            "faces": {
-                "north": { "texture": "#translation_chassis_side", "uv": [ 0, 0, 16, 4 ] },
-                "east": { "texture": "#translation_chassis_side", "uv": [ 0, 0, 4, 16 ], "rotation": 90 },
-                "south": { "texture": "#translation_chassis_side", "uv": [ 0, 0, 16, 4 ] },
-                "west": { "texture": "#translation_chassis_side", "uv": [ 12, 0, 16, 16 ], "rotation": 270 },
-                "up": { "texture": "#translation_chassis_side", "uv": [ 0, 0, 16, 16 ] },
-                "down": { "texture": "#translation_chassis_side", "uv": [ 0, 0, 16, 16 ] }
-            }
-        },
-        {
-            "name": "Inner",
-            "from": [ 4, 4, 4 ], 
-            "to": [ 12, 12, 12 ], 
-            "faces": {
-                "north": { "texture": "#translation_chassis_side", "uv": [ 4, 8, 12, 16 ] },
-                "east": { "texture": "#translation_chassis_side", "uv": [ 4, 8, 12, 16 ] },
-                "south": { "texture": "#translation_chassis_side", "uv": [ 4, 8, 12, 16 ] },
-                "west": { "texture": "#translation_chassis_side", "uv": [ 4, 8, 12, 16 ] }
-            }
-        }
-    ]
+	"credit": "Model generated using MrCrayfish's Model Creator (https://mrcrayfish.com/tools?id=mc)",
+	"textures": {
+		"1": "create:block/linear_chassis_side",
+		"4": "create:block/andesite_casing",
+		"5": "create:block/secondary_linear_chassis_side",
+		"6": "create:block/andesite_block",
+		"particle": "create:block/linear_chassis_side"
+	},
+	"elements": [
+		{
+			"name": "Top",
+			"from": [1, 12, 1],
+			"to": [15, 16, 15],
+			"faces": {
+				"north": {"uv": [1, 12, 15, 16], "texture": "#1"},
+				"east": {"uv": [1, 12, 15, 16], "texture": "#1"},
+				"south": {"uv": [1, 12, 15, 16], "texture": "#1"},
+				"west": {"uv": [1, 12, 15, 16], "texture": "#1"},
+				"up": {"uv": [1, 1, 15, 15], "texture": "#6"},
+				"down": {"uv": [1, 1, 15, 15], "texture": "#4"}
+			}
+		},
+		{
+			"name": "Inner",
+			"from": [4, 4, 4],
+			"to": [12, 12, 12],
+			"faces": {
+				"north": {"uv": [4, 8, 12, 16], "texture": "#5"},
+				"east": {"uv": [4, 8, 12, 16], "texture": "#5"},
+				"south": {"uv": [4, 8, 12, 16], "texture": "#5"},
+				"west": {"uv": [4, 8, 12, 16], "texture": "#5"}
+			}
+		}
+	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/create/models/block/contraption_controls/item.json b/src/main/resources/assets/create/models/block/contraption_controls/item.json
index fd7139419..aff25c2f0 100644
--- a/src/main/resources/assets/create/models/block/contraption_controls/item.json
+++ b/src/main/resources/assets/create/models/block/contraption_controls/item.json
@@ -118,6 +118,7 @@
 			"translation": [0, 8.5, -2.25]
 		},
 		"fixed": {
+			"translation": [0, 0, -1.75],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
diff --git a/src/main/resources/assets/create/models/block/controls/item.json b/src/main/resources/assets/create/models/block/controls/item.json
index 6f4c7d39b..5a772fb07 100644
--- a/src/main/resources/assets/create/models/block/controls/item.json
+++ b/src/main/resources/assets/create/models/block/controls/item.json
@@ -124,6 +124,7 @@
 			"translation": [0, 8.5, -2.25]
 		},
 		"fixed": {
+			"translation": [0, 0, -1.75],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
diff --git a/src/main/resources/assets/create/models/block/creative_motor/item.json b/src/main/resources/assets/create/models/block/creative_motor/item.json
index 218ed3c79..566063c41 100644
--- a/src/main/resources/assets/create/models/block/creative_motor/item.json
+++ b/src/main/resources/assets/create/models/block/creative_motor/item.json
@@ -5,8 +5,8 @@
 		"5": "create:block/creative_casing",
 		"6": "create:block/creative_motor",
 		"7": "create:block/flap_display_front",
-		"1_1": "create:block/axis_top",
 		"particle": "create:block/creative_casing",
+		"1_1": "create:block/axis_top",
 		"1_0": "create:block/axis"
 	},
 	"elements": [
@@ -176,6 +176,10 @@
 		"gui": {
 			"rotation": [30, 45, 0],
 			"scale": [0.625, 0.625, 0.625]
+		},
+		"fixed": {
+			"rotation": [0, -90, 0],
+			"scale": [0.5, 0.5, 0.5]
 		}
 	},
 	"groups": [
diff --git a/src/main/resources/assets/create/models/block/large_water_wheel/item.json b/src/main/resources/assets/create/models/block/large_water_wheel/item.json
index e50aa0d70..8d3c91720 100644
--- a/src/main/resources/assets/create/models/block/large_water_wheel/item.json
+++ b/src/main/resources/assets/create/models/block/large_water_wheel/item.json
@@ -17,7 +17,7 @@
 		"fixed": {
             "rotation": [ 90, 0, 0 ],
             "translation": [ 0, 0, 0],
-            "scale":[ 0.4, 0.4, 0.4 ]
+            "scale":[ 0.2, 0.2, 0.2 ]
         },
         "thirdperson_righthand": {
 			"rotation": [75, 45, 0],
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 6603e584c..bb95e3d9e 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
@@ -71,14 +71,34 @@
 		}
 	],
 	"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, 45, 0],
+			"rotation": [30, 225, 0],
 			"translation": [0, 2.5, 0],
 			"scale": [0.625, 0.625, 0.625]
 		},
 		"fixed": {
-			"rotation": [270, 0, 0],
-			"translation": [0, 0, -3],
 			"scale": [0.5, 0.5, 0.5]
 		}
 	}
diff --git a/src/main/resources/assets/create/models/block/scaffold/block.json b/src/main/resources/assets/create/models/block/scaffold/block.json
index 0e7707b06..ff3d988a8 100644
--- a/src/main/resources/assets/create/models/block/scaffold/block.json
+++ b/src/main/resources/assets/create/models/block/scaffold/block.json
@@ -32,14 +32,21 @@
 				"up": {"uv": [0, 0, 16, 16], "texture": "#top"}
 			}
 		},
+		{
+			"name": "inner_top",
+			"from": [0, 15.9, 0],
+			"to": [16, 16, 16],
+			"faces": {
+				"down": {"uv": [0, 0, 16, 16], "texture": "#top"}
+			}
+		},
 		{
 			"name": "inside",
 			"from": [0.05, 0, 16],
 			"to": [15.95, 16, 0],
 			"faces": {
 				"east": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "east"},
-				"west": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "west"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#top"}
+				"west": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "west"}
 			}
 		},
 		{
@@ -48,8 +55,7 @@
 			"to": [16, 16, 0.05],
 			"faces": {
 				"north": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "south"},
-				"south": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "north"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#top"}
+				"south": {"uv": [0, 0, 16, 16], "texture": "#inside", "cullface": "north"}
 			}
 		}
 	]
diff --git a/src/main/resources/assets/create/textures/block/bearing_top_wooden.png b/src/main/resources/assets/create/textures/block/bearing_top_wooden.png
deleted file mode 100644
index 889a11259dab3c63bf927383d35aec30d97a6597..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 444
zcmV;t0Ym<YP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002AP)t-sV2n{}
zwpc=RH+#Hmiob79g+f0&97tO%h`Vj8=$WhLm~OXNK1d^Sv{;O>XN$dVgT`}0axzPN
zKVF+oKy)&N#dBerPHeGOHCZaH(1%QeKv75{K65cnL?Ah6Eki66KPeJUF&9NZ9z<9w
zPf{pYhfFje4lGS1tLvOtnMqPN8BK*iM^7eERw^@DDn@cUPedV7Nh4D@8mXzNPcj%@
zoKI`HSu<fMKXfvL$8?pCk3K09M_|Z;0002PNkl<Zc-ke8SCT{_2t}QobIz&5yriOn
zg8ScB<7<9yajGt-Fi~oo80U~^L{eJ#AOe#QNyOB&faTIo;nu=eNY&K8-M#(Ov&Wl@
zEBySPf!$%kT#&AxYy%TyT}!6~pBo5f%KXpVF_D96q693+*cD<tpS7XnoJ&5?0M)K~
zOIpap+H*l~c+1RG5Q*<5P%uK#J!|3qeeD%|xXa@c!a@%(<GNK+?*?~t7=~9j{HCT&
mZzDjAz4t$9)^7in)iyRc{V%`XfY_D*0000<MNUMnLSTY6IJdk2

diff --git a/src/main/resources/assets/create/textures/block/cart_assembler_side.png b/src/main/resources/assets/create/textures/block/cart_assembler_side.png
index 75ae79d65c3f611342263997e60ba6dd0d210f61..694c01af59ab7a12945e572166b82ae5d2f605a3 100644
GIT binary patch
delta 296
zcmV+@0oVTe0mA~2B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000#P)t-sSy@>_
zLqjJgCoV27JUl#9R8(7ATSi7kMMXtHK|w-7LPtkOH6af$9u7Jr5ke~zPcj%uFBd*3
z5>q%DJ0=le!#_I!000SaNLh0L01m?d01m?e$8V@)0001uNq<B^R47wjPeBsIAP9qP
zyV}+Y2>*ZU2JLAxOd|0RLc||nW8O9>W1rY}%$`aI@SQaIpfXXpoEMk7GPS3*=gC=0
zUDWyz>uRHqG1Aa(qTNlPMga;l2^e?_g^GtL49AB!3`@hqVVb7lxp=5*DrH_qzQK*S
u-i5ETa9t<P(;?rpC(){u-B!)N`b<ASnhEi_-I1sO0000<MNUMnLSTaVLvD`%

delta 222
zcmV<403rXw0{Q`vB!5UyOjJd-wziIrj&E;oTU%RMSy@z6R7XcgMn*<OMMXnHLqbAA
zK|w)NI2t@WJWnzhNiP>dD-<p+E<Py|J0=l2BoQYkCp94tFdhz?w)~F(003=CL_t(|
z+APU8LPRkT1kpFM`Z=EapOAc!rm;zzs!~^V)$RoMRMm~qm{*=;RWFOZY<x~FkN*GS
zL%mg$l=$s6d+M6Wb+20wjW}YAGpCcTNC%<%*H>_Y-2^sWjOMV>#-ZLt1tnCzMh(9J
Y05ptECq#PA0000007*qoM6N<$g10zVhyVZp

diff --git a/src/main/resources/assets/create/textures/block/cart_assembler_top.png b/src/main/resources/assets/create/textures/block/cart_assembler_top.png
index e31c0eb896d428a753d8dd50798ecb329441ad80..0e18d893fb44ec37bed8fda2e69556c07b84b597 100644
GIT binary patch
delta 494
zcmV<K0TKSY1Be8WB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0002GP)t-ssi~=z
zkB>)3M@B|QLqkJCLP9}7K}AJHR8&+*QAS&8SX*0LR%KF6R!dliOfy+3O<_n&d_O{T
zH+#Hmiob8G=9q4`SYet@LUJ;4v{;M1ZeE;EIcP0YQ&VcTSbv1abZfa;U}Il{#&c}3
zR#jwDUYky|!MLHTq)<~)HCZZJYF9>bJ3n+XkCu^IT3Rz<C|h<_tLvOcQAI#>GCp%L
zEKMYgv1f?8ZL8>+g~fBN(1%ThKum)`L_|d1!%js2000SaNLh0L01m<c01m<d6(~x8
z0002jNkl<ZD1TEWkB3sjFbsy}I71$(-Lf%Y8*me96DUwt;Qe0<wdhW#`?Wp^fK|M1
zT7Zs|G13eLN<~2{M8<$)FBc1A?UGz#MTynX@yY4g`NgHXlGhx#G&erDC|tO`Gxs%c
z-KUV^dKg`B51R%$%*By@q)f>Z;h6l_!+Lb~fK^4rIA;uT6i?5DZIuaIAF1xQKEHI(
zDC51~FAY9f!q%ut3N$3r>)URkJ9K{k_zbRuuW!4fjtXU-v$S&l$+H!lFo+v10QyO5
kalq2o-7jNpQ}c?kKUm-uU$QZB-2eap07*qoM6N<$f;EfLUjP6A

delta 417
zcmV;S0bc%y1iJ%}B!8$-OjJdy=$WhLn61!<gvWHLsi}p<bA!fniob7*y>5uRZF{_H
zjIn2Hxmj+vSaP&jYPMKxu~wCjk6xTlVVX`}n@(ViQCNpea&mG_g+NS$KwEZIOME|D
zYFJuoS4MI>R%KE`bT?IGQa^MuLUJ-&TU%OMT1{a{R8&+sXn!qJQ&UY=OGr^hGhrx4
zQAIUbDl=IsM@L6SMn*+NMMOkILqkJCLP9}7K`c!q-4h$V0002aNkl<Zc-kG$1-im8
z3;^KbE(s1Ld#`h?%<g|Pveh;J7cmE8o3?Y#SuQXa0C676AP8bFh+_a@<4oS~I*LBr
zWo-E1Z@ZctE`R=UjfqUHuu`99dn`2WmuLOo2<v49UTFRx+++1^g^O>h;Qe?)VaKdQ
z-UG}Z8l#a7)UY2;iZ`=epb6mdn9l(;l}@yQo)KxKi0B$I+r)tySX?aj`#!YH(rzR6
zsP>C#)bk4yOL~%w<nu+(D7VbU@z=}4Fbh2|A6d@Y)f!yd#u|Vh_5&UE3KK`p00000
LNkvXXu0mjfHZ`}W