From 6f7ab85692f97691defcc5eb6fcad874d66329d9 Mon Sep 17 00:00:00 2001
From: GearShocky <gearshockmirasu@gmail.com>
Date: Wed, 6 Oct 2021 13:01:17 +0600
Subject: [PATCH] fix

---
 .../models/block/matter_bottler_error.json    | 317 ++++++++++++++++++
 .../models/block/matter_bottler_idle.json     |   6 +-
 .../models/block/matter_scanner_error.json    | 227 ++++++++++++-
 .../models/block/matter_scanner_idle.json     |   2 +-
 4 files changed, 544 insertions(+), 8 deletions(-)
 create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json

diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json
new file mode 100644
index 000000000..740d95133
--- /dev/null
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json
@@ -0,0 +1,317 @@
+{
+	"parent": "block/block",
+	"texture_size": [32, 16],
+	"textures": {
+		"particle": "overdrive_that_matters:block/matter_bottler",
+		"battery_texture": "overdrive_that_matters:block/matterybank_core",
+		"texture": "overdrive_that_matters:block/matter_bottler"
+	},
+	"elements": [
+		{
+			"name": "battery1",
+			"from": [7, 9.5, 1.5],
+			"to": [9, 15.5, 6.5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]},
+			"faces": {
+				"north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"},
+				"east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"},
+				"south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"},
+				"west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"},
+				"up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"},
+				"down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"}
+			}
+		},
+		{
+			"name": "battery2",
+			"from": [4, 9.5, 1.5],
+			"to": [6, 15.5, 6.5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]},
+			"faces": {
+				"north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"},
+				"east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"},
+				"south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"},
+				"west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"},
+				"up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"},
+				"down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"}
+			}
+		},
+		{
+			"name": "battery3",
+			"from": [1, 9.5, 1.5],
+			"to": [3, 15.5, 6.5],
+			"rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]},
+			"faces": {
+				"north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"},
+				"east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"},
+				"south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"},
+				"west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"},
+				"up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"},
+				"down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 0, 0],
+			"to": [16, 10, 12],
+			"faces": {
+				"north": {"uv": [0, 3, 4, 8], "texture": "#texture"},
+				"east": {"uv": [5, 3, 8, 8], "texture": "#texture"},
+				"south": {"uv": [4, 11, 8, 16], "texture": "#texture"},
+				"west": {"uv": [8, 3, 5, 8], "texture": "#texture"},
+				"up": {"uv": [0, 10.5, 3.75, 15.5], "texture": "#texture"},
+				"down": {"uv": [0, 10, 4, 16], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [10, 10, 2],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 1.5, 3], "texture": "#texture"},
+				"east": {"uv": [4, 0, 7.5, 3], "texture": "#texture"},
+				"south": {"uv": [2.5, 0, 4, 3], "texture": "#texture"},
+				"west": {"uv": [12.5, 6, 16, 9], "texture": "#texture"},
+				"up": {"uv": [7.5, 0, 11, 3], "rotation": 270, "texture": "#texture"},
+				"down": {"uv": [0, 0, 3, 14], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 10, 7],
+			"to": [10, 16, 12],
+			"faces": {
+				"north": {"uv": [8, 13, 10.5, 16], "texture": "#texture"},
+				"east": {"uv": [0, 0, 2.5, 6], "texture": "#missing"},
+				"south": {"uv": [4, 8, 6.5, 11], "texture": "#texture"},
+				"west": {"uv": [10.5, 13, 11.75, 16], "texture": "#texture"},
+				"up": {"uv": [8, 10.5, 10.5, 13], "texture": "#texture"},
+				"down": {"uv": [0, 0, 5, 5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "capacitorsocket",
+			"from": [0, 10, 0],
+			"to": [10, 11, 7],
+			"faces": {
+				"north": {"uv": [11, 0, 13.5, 0.5], "texture": "#texture"},
+				"east": {"uv": [11.75, 0, 13.5, 0.5], "texture": "#texture"},
+				"south": {"uv": [0, 0, 5, 1], "texture": "#missing"},
+				"west": {"uv": [11, 0, 12.75, 0.5], "texture": "#texture"},
+				"up": {"uv": [11, 0.5, 13.5, 4], "rotation": 180, "texture": "#texture"},
+				"down": {"uv": [0, 0, 5, 7], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [0, 0, 12],
+			"to": [16, 8, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 8, 8], "texture": "#missing"},
+				"east": {"uv": [4, 4, 5, 8], "texture": "#texture"},
+				"south": {"uv": [8, 4, 12, 8], "texture": "#texture"},
+				"west": {"uv": [5, 4, 4, 8], "texture": "#texture"},
+				"up": {"uv": [0, 10, 4, 12], "rotation": 180, "texture": "#texture"},
+				"down": {"uv": [0, 8, 4, 10], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "body",
+			"from": [10, 8, 12],
+			"to": [16, 10, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 3, 2], "texture": "#missing"},
+				"east": {"uv": [4, 3, 5, 4], "texture": "#texture"},
+				"south": {"uv": [4, 3, 5, 4], "texture": "#texture"},
+				"west": {"uv": [4, 3, 5, 4], "texture": "#texture"},
+				"up": {"uv": [0, 0, 3, 4], "texture": "#missing"},
+				"down": {"uv": [0, 0, 3, 4], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "claw1",
+			"from": [7.2, 8.80866, -0.03806],
+			"to": [8.8, 13.80866, 1.96194],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]},
+			"faces": {
+				"north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"},
+				"east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"},
+				"down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "claw2",
+			"from": [4.2, 8.80866, -0.03806],
+			"to": [5.8, 13.80866, 1.96194],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]},
+			"faces": {
+				"north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"},
+				"east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"},
+				"down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "claw3",
+			"from": [1.2, 8.80866, -0.03806],
+			"to": [2.8, 13.80866, 1.96194],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]},
+			"faces": {
+				"north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"},
+				"east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"},
+				"up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"},
+				"down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "screen",
+			"from": [11.2, 11.49895, 1.49163],
+			"to": [14.8, 15.49895, 2.49163],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [13, 15.49895, -0.00837]},
+			"faces": {
+				"north": {"uv": [13.5, 2, 14.5, 4], "texture": "#texture"},
+				"east": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"},
+				"south": {"uv": [14.5, 2.5, 15.5, 4.5], "texture": "#texture"},
+				"west": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"},
+				"up": {"uv": [14.5, 2, 15.5, 2.5], "texture": "#texture"},
+				"down": {"uv": [14.5, 2, 15.5, 2.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "canister",
+			"from": [2, 12, 12],
+			"to": [10, 15, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 4, 3], "texture": "#missing"},
+				"east": {"uv": [0, 0, 1.5, 3], "texture": "#missing"},
+				"south": {"uv": [14, 4.5, 16, 6], "texture": "#texture"},
+				"west": {"uv": [13.25, 4.5, 14, 6], "texture": "#texture"},
+				"up": {"uv": [14, 4.5, 16, 6], "texture": "#texture"},
+				"down": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "canister",
+			"from": [2, 8, 12],
+			"to": [10, 11, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 4, 3], "texture": "#missing"},
+				"east": {"uv": [0, 0, 1.5, 3], "texture": "#missing"},
+				"south": {"uv": [14, 4.5, 16, 6], "texture": "#texture"},
+				"west": {"uv": [13.25, 4.5, 14, 6], "texture": "#texture"},
+				"up": {"uv": [14, 4.5, 16, 6], "texture": "#texture"},
+				"down": {"uv": [0, 0, 4, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "tube",
+			"from": [1, 13, 12],
+			"to": [2, 14, 14],
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
+				"east": {"uv": [0, 0, 1, 1], "texture": "#missing"},
+				"south": {"uv": [14.5, 11.5, 15, 12.5], "texture": "#texture"},
+				"west": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 270, "texture": "#texture"},
+				"up": {"uv": [14.5, 10.5, 15, 12.5], "texture": "#texture"},
+				"down": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 180, "texture": "#texture"}
+			}
+		},
+		{
+			"name": "tube",
+			"from": [1, 9, 12],
+			"to": [2, 10, 14],
+			"faces": {
+				"north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"},
+				"east": {"uv": [0, 0, 1, 1], "texture": "#missing"},
+				"south": {"uv": [14.5, 11.5, 15, 12.5], "texture": "#texture"},
+				"west": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 270, "texture": "#texture"},
+				"up": {"uv": [14.5, 10.5, 15, 12.5], "texture": "#texture"},
+				"down": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 180, "texture": "#texture"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 8, 15],
+			"to": [0, 16, 16],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 8], "texture": "#missing"},
+				"east": {"uv": [15.75, 0, 16, 4], "texture": "#texture"},
+				"south": {"uv": [0, 0, 0, 8], "texture": "#missing"},
+				"west": {"uv": [15.75, 0, 16, 4], "texture": "#texture"},
+				"up": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 8, 16],
+			"to": [1, 16, 16],
+			"faces": {
+				"north": {"uv": [15.75, 0, 16, 4], "texture": "#texture"},
+				"east": {"uv": [0, 0, 0, 8], "texture": "#missing"},
+				"south": {"uv": [15.75, 0, 16, 4], "texture": "#texture"},
+				"west": {"uv": [0, 0, 0, 8], "texture": "#missing"},
+				"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "rame",
+			"from": [0, 11, 12],
+			"to": [0, 12, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"},
+				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"west": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"},
+				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 15, 12],
+			"to": [0, 16, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"},
+				"south": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"west": {"uv": [15.75, 0.5, 16, 1.5], "texture": "#texture"},
+				"up": {"uv": [0, 0, 0, 3], "texture": "#missing"},
+				"down": {"uv": [0, 0, 0, 3], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [1, 11, 16],
+			"to": [10, 12, 16],
+			"faces": {
+				"north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"},
+				"east": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"},
+				"west": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [1, 15, 16],
+			"to": [10, 16, 16],
+			"faces": {
+				"north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"},
+				"east": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"},
+				"west": {"uv": [0, 0, 0, 1], "texture": "#missing"},
+				"up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"},
+				"down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json
index 4961bc2ac..48ae78528 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json
@@ -2,9 +2,9 @@
 	"parent": "block/block",
 	"texture_size": [32, 16],
 	"textures": {
-		"particle": "overdrive_that_matters:block/matter_bottler_offline",
+		"particle": "overdrive_that_matters:block/matter_bottler",
 		"battery_texture": "overdrive_that_matters:block/matterybank_core",
-		"texture": "overdrive_that_matters:block/matter_bottler_offline"
+		"texture": "overdrive_that_matters:block/matter_bottler"
 	},
 	"elements": [
 		{
@@ -175,7 +175,7 @@
 			"to": [14.8, 15.49895, 2.49163],
 			"rotation": {"angle": 22.5, "axis": "x", "origin": [13, 15.49895, -0.00837]},
 			"faces": {
-				"north": {"uv": [14.5, 0, 15.5, 2], "texture": "#texture"},
+				"north": {"uv": [13.5, 0, 14.5, 2], "texture": "#texture"},
 				"east": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"},
 				"south": {"uv": [14.5, 2.5, 15.5, 4.5], "texture": "#texture"},
 				"west": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"},
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json
index d07163c55..8195cded3 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json
@@ -1,8 +1,227 @@
 {
-	"parent": "overdrive_that_matters:block/matter_scanner_working",
+	"parent": "block/block",
 	"texture_size": [32, 64],
 	"textures": {
-		"texture": "overdrive_that_matters:block/matter_scanner_halted",
-		"particle": "overdrive_that_matters:block/matter_scanner_halted"
-	}
+		"texture": "overdrive_that_matters:block/matter_scanner",
+		"particle": "overdrive_that_matters:block/matter_scanner"
+	},
+	"elements": [
+		{
+			"name": "platform",
+			"from": [0, 4, 0],
+			"to": [16, 8, 16],
+			"faces": {
+				"north": {"uv": [0, 4, 8, 5], "texture": "#texture"},
+				"east": {"uv": [0, 4, 8, 5], "texture": "#texture"},
+				"south": {"uv": [0, 4, 8, 5], "texture": "#texture"},
+				"west": {"uv": [0, 4, 8, 5], "texture": "#texture"},
+				"up": {"uv": [0, 0, 8, 4], "texture": "#texture"},
+				"down": {"uv": [0, 5, 8, 9], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "base",
+			"from": [0, 0, 0],
+			"to": [16, 2, 16],
+			"faces": {
+				"north": {"uv": [0, 9, 8, 9.5], "texture": "#texture"},
+				"east": {"uv": [0, 9, 8, 9.5], "texture": "#texture"},
+				"south": {"uv": [0, 9, 8, 9.5], "texture": "#texture"},
+				"west": {"uv": [0, 9, 8, 9.5], "texture": "#texture"},
+				"up": {"uv": [8, 5, 16, 9], "texture": "#texture"},
+				"down": {"uv": [0, 9.5, 8, 13.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "pane",
+			"from": [1, 2, 1],
+			"to": [15, 4, 15],
+			"faces": {
+				"north": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"},
+				"east": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"},
+				"south": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"},
+				"west": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"},
+				"up": {"uv": [0, 0, 14, 14], "texture": "#missing"},
+				"down": {"uv": [0, 0, 14, 14], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 14, 1],
+			"to": [1, 15, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 1, 1], "texture": "#missing"},
+				"east": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"},
+				"south": {"uv": [0, 0, 1, 1], "texture": "#missing"},
+				"west": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"},
+				"up": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"},
+				"down": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 8, 0],
+			"to": [16, 16, 1],
+			"faces": {
+				"north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"},
+				"down": {"uv": [0, 0, 1, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 8, 0],
+			"to": [1, 16, 1],
+			"faces": {
+				"north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"},
+				"down": {"uv": [0, 0, 1, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [0, 8, 15],
+			"to": [1, 16, 16],
+			"faces": {
+				"north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"},
+				"down": {"uv": [0, 0, 1, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 8, 15],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"},
+				"up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"},
+				"down": {"uv": [0, 0, 1, 1], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "frame",
+			"from": [15, 14, 1],
+			"to": [16, 15, 15],
+			"faces": {
+				"north": {"uv": [0, 0, 1, 1], "texture": "#missing"},
+				"east": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"},
+				"south": {"uv": [0, 0, 1, 1], "texture": "#missing"},
+				"west": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"},
+				"up": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"},
+				"down": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "panel",
+			"from": [10, 5, -4],
+			"to": [14, 9, -3],
+			"rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]},
+			"faces": {
+				"north": {"uv": [12, 1	, 14, 2], "texture": "#texture"},
+				"east": {"uv": [8, 1, 10, 1.25], "rotation": 90, "texture": "#texture"},
+				"south": {"uv": [8, 1.25, 10, 2.25], "texture": "#texture"},
+				"west": {"uv": [8, 1, 10, 1.25], "rotation": 270, "texture": "#texture"},
+				"up": {"uv": [8, 1, 10, 1.25], "texture": "#texture"},
+				"down": {"uv": [8, 1, 10, 1.25], "rotation": 180, "texture": "#texture"}
+			}
+		},
+		{
+			"name": "railholder",
+			"from": [0, 13, 11],
+			"to": [2, 14, 13],
+			"faces": {
+				"north": {"uv": [8, 9.75, 9, 10], "texture": "#texture"},
+				"east": {"uv": [8, 9.75, 9, 10], "texture": "#texture"},
+				"south": {"uv": [8, 9.75, 9, 10], "texture": "#texture"},
+				"west": {"uv": [8, 10, 9, 10.25], "texture": "#texture"},
+				"up": {"uv": [8, 9, 9, 9.5], "texture": "#texture"},
+				"down": {"uv": [8, 10, 9, 10.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "railholder",
+			"from": [1, 14, 11],
+			"to": [2, 15, 13],
+			"faces": {
+				"north": {"uv": [8, 9.25, 8.5, 9.5], "texture": "#texture"},
+				"east": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"},
+				"south": {"uv": [8, 9.5, 8.5, 9.75], "texture": "#texture"},
+				"west": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"},
+				"up": {"uv": [8, 9, 9, 9.25], "texture": "#texture"},
+				"down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "railholder",
+			"from": [14, 14, 11],
+			"to": [15, 15, 13],
+			"faces": {
+				"north": {"uv": [8, 9.25, 8.5, 9.5], "texture": "#texture"},
+				"east": {"uv": [8, 9.25, 9, 9.5], "texture": "#texture"},
+				"south": {"uv": [8, 9.5, 8.5, 9.75], "texture": "#texture"},
+				"west": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"},
+				"up": {"uv": [8, 9, 9, 9.25], "texture": "#texture"},
+				"down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}
+			}
+		},
+		{
+			"name": "railholder",
+			"from": [14, 13, 11],
+			"to": [16, 14, 13],
+			"faces": {
+				"north": {"uv": [8, 9.75, 9, 10], "texture": "#texture"},
+				"east": {"uv": [8, 9.75, 9, 10], "texture": "#texture"},
+				"south": {"uv": [8, 9.75, 9, 10], "texture": "#texture"},
+				"west": {"uv": [8, 10, 9, 10.25], "texture": "#texture"},
+				"up": {"uv": [8, 9, 9, 9.5], "texture": "#texture"},
+				"down": {"uv": [8, 10, 9, 10.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "rail",
+			"from": [2, 14, 11],
+			"to": [14, 14, 13],
+			"faces": {
+				"north": {"uv": [0, 0, 12, 0], "texture": "#missing"},
+				"east": {"uv": [0, 0, 2, 0], "texture": "#missing"},
+				"south": {"uv": [0, 0, 12, 0], "texture": "#missing"},
+				"west": {"uv": [0, 0, 2, 0], "texture": "#missing"},
+				"up": {"uv": [10, 9, 16, 9.5], "texture": "#texture"},
+				"down": {"uv": [10, 9, 16, 9.5], "texture": "#texture"}
+			}
+		},
+		{
+			"name": "scanner",
+			"from": [3, 13, 9],
+			"to": [6, 15, 14],
+			"faces": {
+				"north": {"uv": [8, 12.25, 9.5, 12.75], "texture": "#texture"},
+				"east": {"uv": [9.5, 11, 10.5, 12.25], "rotation": 90, "texture": "#texture"},
+				"south": {"uv": [8, 12.25, 9.5, 12.75], "texture": "#texture"},
+				"west": {"uv": [9.5, 11, 10.5, 12.25], "rotation": 90, "texture": "#texture"},
+				"up": {"uv": [8, 11, 9.5, 12.25], "texture": "#texture"},
+				"down": {"uv": [13.5, 11, 15, 12.25], "texture": "#texture"}
+			}
+		}
+	],
+	"groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+		{
+			"name": "rail",
+			"origin": [0, 0, 0],
+			"color": 0,
+			"children": [10, 11, 12, 13, 14, 15]
+		}
+	]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json
index 2a24ebb07..1b2e7a36e 100644
--- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json
+++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json
@@ -129,7 +129,7 @@
 			"to": [14, 9, -3],
 			"rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]},
 			"faces": {
-				"north": {"uv": [8, 0, 10, 1], "texture": "#texture"},
+				"north": {"uv": [12, 0, 14, 1], "texture": "#texture"},
 				"east": {"uv": [8, 1, 10, 1.25], "rotation": 90, "texture": "#texture"},
 				"south": {"uv": [8, 1.25, 10, 2.25], "texture": "#texture"},
 				"west": {"uv": [8, 1, 10, 1.25], "rotation": 270, "texture": "#texture"},