diff --git a/gradle.properties b/gradle.properties
index 5cfb71bed..498670ccf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ parchment_version = 2021.12.19
 
 # dependency versions
 registrate_version = MC1.18-1.0.21
-flywheel_version = 1.18-0.5.1.46
+flywheel_version = 1.18-0.6.0.48
 jei_minecraft_version = 1.18
 jei_version = 9.0.0.40
 
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
index 6e19d1d27..4b68fd1a8 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
@@ -7,7 +7,7 @@ import com.jozufozu.flywheel.backend.Backend;
 import com.jozufozu.flywheel.backend.RenderLayer;
 import com.jozufozu.flywheel.backend.gl.GlStateTracker;
 import com.jozufozu.flywheel.backend.gl.GlTextureUnit;
-import com.jozufozu.flywheel.backend.gl.GlVertexArray;
+import com.jozufozu.flywheel.config.FlwEngine;
 import com.jozufozu.flywheel.core.Formats;
 import com.jozufozu.flywheel.core.Materials;
 import com.jozufozu.flywheel.core.compile.ProgramContext;
@@ -17,7 +17,6 @@ import com.jozufozu.flywheel.util.Textures;
 import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
 import com.simibubi.create.foundation.render.CreateContexts;
 
-import net.minecraft.client.renderer.RenderType;
 import net.minecraft.world.level.LevelAccessor;
 
 public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContraption> {
@@ -44,32 +43,13 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 		GlStateTracker.State restoreState = GlStateTracker.getRestoreState();
 		GlTextureUnit active = GlTextureUnit.getActive();
 
-		RenderType type = event.getType();
-
-		type.setupRenderState();
-
-		Textures.bindActiveTextures();
-
-		ContraptionProgram structureShader = CreateContexts.STRUCTURE.getProgram(ProgramContext.create(Materials.Names.PASSTHRU, Formats.BLOCK, RenderLayer.getLayer(type)));
-
-		structureShader.bind();
-		structureShader.uploadViewProjection(event.viewProjection);
-		structureShader.uploadCameraPos(event.camX, event.camY, event.camZ);
-
-		for (FlwContraption flwContraption : visible) {
-			flwContraption.renderStructureLayer(type, structureShader);
+		if (Backend.getEngine() != FlwEngine.BATCHING) {
+			renderStructures(event);
 		}
 
-		restoreState.restore();
-		layer.setupRenderState();
-
-        if (Backend.isOn()) {
-			RenderLayer renderLayer = event.getLayer();
-			if (renderLayer != null) {
-
-				for (FlwContraption renderer : visible) {
-					renderer.renderInstanceLayer(event);
-				}
+		if (event.getLayer() != null) {
+			for (FlwContraption renderer : visible) {
+				renderer.renderInstanceLayer(event);
 			}
 		}
 
@@ -77,11 +57,27 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 		GlTextureUnit.T4.makeActive();
 		glBindTexture(GL_TEXTURE_3D, 0);
 
-		type.clearRenderState();
+		event.type.clearRenderState();
 		active.makeActive();
 		restoreState.restore();
 	}
 
+	private void renderStructures(RenderLayerEvent event) {
+
+		event.type.setupRenderState();
+		Textures.bindActiveTextures();
+
+		ContraptionProgram structureShader = CreateContexts.STRUCTURE.getProgram(ProgramContext.create(Materials.Names.PASSTHRU, Formats.BLOCK, RenderLayer.getLayer(event.type)));
+
+		structureShader.bind();
+		structureShader.uploadViewProjection(event.viewProjection);
+		structureShader.uploadCameraPos(event.camX, event.camY, event.camZ);
+
+		for (FlwContraption flwContraption : visible) {
+			flwContraption.renderStructureLayer(event.type, structureShader);
+		}
+	}
+
 	@Override
 	protected FlwContraption create(Contraption c) {
 		VirtualRenderWorld renderWorld = ContraptionRenderDispatcher.setupRenderWorld(world, c);
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 83873fd8d..b88f20841 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -32,6 +32,6 @@ Technology that empowers the player.'''
 [[dependencies.create]]
     modId="flywheel"
     mandatory=true
-    versionRange="[1.18-0.5.1,1.18-0.5.2)"
+    versionRange="[1.18-0.6.0,1.18-0.6.1)"
     ordering="AFTER"
     side="BOTH"