diff --git a/src/main/resources/assets/forestry/models/block/machines/carpenter.json b/src/main/resources/assets/forestry/models/block/machines/carpenter.json
new file mode 100644
index 000000000..4d334edb0
--- /dev/null
+++ b/src/main/resources/assets/forestry/models/block/machines/carpenter.json
@@ -0,0 +1,46 @@
+{
+	"credit": "Made with Blockbench",
+	"texture_size": [64, 64],
+	"textures": {
+		"1": "forestry:block/machines/carpenter",
+		"particle": "forestry:block/carpenter"
+	},
+	"elements": [
+		{
+			"from": [0, 0, 0],
+			"to": [16, 16, 4],
+			"faces": {
+				"north": {"uv": [1, 1, 5, 5], "texture": "#1"},
+				"east": {"uv": [0, 1, 1, 5], "texture": "#1"},
+				"south": {"uv": [6, 1, 10, 5], "texture": "#1"},
+				"west": {"uv": [5, 1, 6, 5], "texture": "#1"},
+				"up": {"uv": [5, 1, 1, 0], "texture": "#1"},
+				"down": {"uv": [9, 0, 5, 1], "texture": "#1"}
+			}
+		},
+		{
+			"from": [0, 0, 12],
+			"to": [16, 16, 16],
+			"faces": {
+				"north": {"uv": [1, 6.5, 5, 10.5], "texture": "#1"},
+				"east": {"uv": [0, 6.5, 1, 10.5], "texture": "#1"},
+				"south": {"uv": [6, 6.5, 10, 10.5], "texture": "#1"},
+				"west": {"uv": [5, 6.5, 6, 10.5], "texture": "#1"},
+				"up": {"uv": [5, 6.5, 1, 5.5], "texture": "#1"},
+				"down": {"uv": [9, 5.5, 5, 6.5], "texture": "#1"}
+			}
+		},
+		{
+			"from": [2, 2, 4],
+			"to": [14, 14, 12],
+			"faces": {
+				"north": {"uv": [2, 13, 5, 16], "texture": "#1"},
+				"east": {"uv": [0, 13, 2, 16], "texture": "#1"},
+				"south": {"uv": [7, 13, 10, 16], "texture": "#1"},
+				"west": {"uv": [5, 13, 7, 16], "texture": "#1"},
+				"up": {"uv": [5, 13, 2, 11], "texture": "#1"},
+				"down": {"uv": [8, 11, 5, 13], "texture": "#1"}
+			}
+		}
+	]
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/forestry/textures/block/apatite_ore.png b/src/main/resources/assets/forestry/textures/block/apatite_ore.png
index 1e315d78b..127fffb50 100644
Binary files a/src/main/resources/assets/forestry/textures/block/apatite_ore.png and b/src/main/resources/assets/forestry/textures/block/apatite_ore.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/carpenter.0.png b/src/main/resources/assets/forestry/textures/block/carpenter.0.png
index 4cdcd3152..0fbac9536 100644
Binary files a/src/main/resources/assets/forestry/textures/block/carpenter.0.png and b/src/main/resources/assets/forestry/textures/block/carpenter.0.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/carpenter_base.png b/src/main/resources/assets/forestry/textures/block/carpenter_base.png
index e960b1156..15dee7073 100644
Binary files a/src/main/resources/assets/forestry/textures/block/carpenter_base.png and b/src/main/resources/assets/forestry/textures/block/carpenter_base.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/carpenter_tank_product_empty.png b/src/main/resources/assets/forestry/textures/block/carpenter_tank_product_empty.png
index 4f9d83266..78cc3c4d3 100644
Binary files a/src/main/resources/assets/forestry/textures/block/carpenter_tank_product_empty.png and b/src/main/resources/assets/forestry/textures/block/carpenter_tank_product_empty.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/carpenter_tank_resource_empty.png b/src/main/resources/assets/forestry/textures/block/carpenter_tank_resource_empty.png
index a237213ec..f07e7bc97 100644
Binary files a/src/main/resources/assets/forestry/textures/block/carpenter_tank_resource_empty.png and b/src/main/resources/assets/forestry/textures/block/carpenter_tank_resource_empty.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/deepslate_apatite_ore.png b/src/main/resources/assets/forestry/textures/block/deepslate_apatite_ore.png
index c27e68e7b..bf5ecc454 100644
Binary files a/src/main/resources/assets/forestry/textures/block/deepslate_apatite_ore.png and b/src/main/resources/assets/forestry/textures/block/deepslate_apatite_ore.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/deepslate_tin_ore.png b/src/main/resources/assets/forestry/textures/block/deepslate_tin_ore.png
index c9439a829..cea9400a0 100644
Binary files a/src/main/resources/assets/forestry/textures/block/deepslate_tin_ore.png and b/src/main/resources/assets/forestry/textures/block/deepslate_tin_ore.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/machine_tank_high.png b/src/main/resources/assets/forestry/textures/block/machine_tank_high.png
index 5095e006f..a3f239574 100644
Binary files a/src/main/resources/assets/forestry/textures/block/machine_tank_high.png and b/src/main/resources/assets/forestry/textures/block/machine_tank_high.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/machine_tank_low.png b/src/main/resources/assets/forestry/textures/block/machine_tank_low.png
index 5179cc899..0d457cacb 100644
Binary files a/src/main/resources/assets/forestry/textures/block/machine_tank_low.png and b/src/main/resources/assets/forestry/textures/block/machine_tank_low.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/machine_tank_maximum.png b/src/main/resources/assets/forestry/textures/block/machine_tank_maximum.png
index fbb5ab2d9..e22544b08 100644
Binary files a/src/main/resources/assets/forestry/textures/block/machine_tank_maximum.png and b/src/main/resources/assets/forestry/textures/block/machine_tank_maximum.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/machine_tank_medium.png b/src/main/resources/assets/forestry/textures/block/machine_tank_medium.png
index ce81d09b7..658e40c3d 100644
Binary files a/src/main/resources/assets/forestry/textures/block/machine_tank_medium.png and b/src/main/resources/assets/forestry/textures/block/machine_tank_medium.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/machines/carpenter.png b/src/main/resources/assets/forestry/textures/block/machines/carpenter.png
new file mode 100644
index 000000000..85077ddb9
Binary files /dev/null and b/src/main/resources/assets/forestry/textures/block/machines/carpenter.png differ
diff --git a/src/main/resources/assets/forestry/textures/block/tin_ore.png b/src/main/resources/assets/forestry/textures/block/tin_ore.png
index 313a30fe0..409eafde0 100644
Binary files a/src/main/resources/assets/forestry/textures/block/tin_ore.png and b/src/main/resources/assets/forestry/textures/block/tin_ore.png differ