From 149dfaf4458e58603bc04faa16c8f015b13a4349 Mon Sep 17 00:00:00 2001
From: muzikbike <52297970+muzikbike@users.noreply.github.com>
Date: Sat, 7 Dec 2024 15:12:15 +0000
Subject: [PATCH] upload fixed model for 1.21.4

---
 .../block/flower_pot_cross_emissive.json      | 131 +++++++++++++++++-
 1 file changed, 130 insertions(+), 1 deletion(-)

diff --git a/common/src/main/resources/assets/minecraft/models/block/flower_pot_cross_emissive.json b/common/src/main/resources/assets/minecraft/models/block/flower_pot_cross_emissive.json
index 789163df86..eefd037aa9 100644
--- a/common/src/main/resources/assets/minecraft/models/block/flower_pot_cross_emissive.json
+++ b/common/src/main/resources/assets/minecraft/models/block/flower_pot_cross_emissive.json
@@ -1 +1,130 @@
-how do i correctly create a new branch in my own fork based on the latest version of this branch?????
+{
+	"ambientocclusion": false,
+	"textures": {
+		"particle": "block/flower_pot",
+		"flowerpot": "block/flower_pot",
+		"dirt": "block/dirt"
+	},
+	"elements": [
+		{
+			"from": [5, 0, 5],
+			"to": [11, 6, 11],
+			"faces": {
+				"north": {"uv": [5, 10, 11, 16], "texture": "#flowerpot"},
+				"east": {"uv": [5, 10, 11, 16], "texture": "#flowerpot"},
+				"south": {"uv": [5, 10, 11, 16], "texture": "#flowerpot"},
+				"west": {"uv": [5, 10, 11, 16], "texture": "#flowerpot"}
+			}
+		},
+		{
+			"from": [5, 0, 5],
+			"to": [10, 6, 6],
+			"faces": {
+				"up": {"uv": [5, 5, 10, 6], "texture": "#flowerpot"},
+				"down": {"uv": [5, 10, 10, 11], "texture": "#flowerpot", "cullface": "down"}
+			}
+		},
+		{
+			"from": [10, 0, 5],
+			"to": [11, 6, 10],
+			"faces": {
+				"up": {"uv": [10, 5, 11, 10], "texture": "#flowerpot"},
+				"down": {"uv": [10, 6, 11, 11], "texture": "#flowerpot", "cullface": "down"}
+			}
+		},
+		{
+			"from": [6, 0, 10],
+			"to": [11, 6, 11],
+			"faces": {
+				"up": {"uv": [6, 10, 11, 11], "texture": "#flowerpot"},
+				"down": {"uv": [6, 5, 11, 6], "texture": "#flowerpot", "cullface": "down"}
+			}
+		},
+		{
+			"from": [5, 0, 6],
+			"to": [6, 6, 11],
+			"faces": {
+				"up": {"uv": [5, 6, 6, 11], "texture": "#flowerpot"},
+				"down": {"uv": [5, 5, 6, 10], "texture": "#flowerpot", "cullface": "down"}
+			}
+		},
+		{
+			"from": [6, 4, 6],
+			"to": [10, 6, 6],
+			"faces": {
+				"south": {"uv": [6, 10, 10, 12], "texture": "#flowerpot"}
+			}
+		},
+		{
+			"from": [10, 4, 6],
+			"to": [10, 6, 10],
+			"faces": {
+				"west": {"uv": [6, 10, 10, 12], "texture": "#flowerpot"}
+			}
+		},
+		{
+			"from": [6, 4, 10],
+			"to": [10, 6, 10],
+			"faces": {
+				"north": {"uv": [6, 10, 10, 12], "texture": "#flowerpot"}
+			}
+		},
+		{
+			"from": [6, 4, 6],
+			"to": [6, 6, 10],
+			"faces": {
+				"east": {"uv": [6, 10, 10, 12], "texture": "#flowerpot"}
+			}
+		},
+		{
+			"from": [6, 0, 6],
+			"to": [10, 4, 10],
+			"faces": {
+				"up": {"uv": [6, 6, 10, 10], "texture": "#dirt"},
+				"down": {"uv": [6, 12, 10, 16], "texture": "#flowerpot", "cullface": "down"}
+			}
+		},
+		{
+			"from": [8, 4, 2.6],
+			"to": [8, 16, 13.4],
+			"shade": false,
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
+			"faces": {
+				"east": {"uv": [0, 0, 16, 16], "texture": "#plant"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#plant"}
+			}
+		},
+		{
+			"from": [8, 4, 2.6],
+			"to": [8, 16, 13.4],
+			"shade": false,
+			"rotation": {"angle": -45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
+			"faces": {
+				"east": {"uv": [0, 0, 16, 16], "texture": "#plant"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#plant"}
+			}
+		},
+		{
+			"from": [2.6, 4, 8],
+			"to": [13.4, 16, 8],
+			"shade": false,
+			"light_emission": 15,
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
+			"faces": {
+				"north": {"uv": [0, 0, 16, 16], "texture": "#cross_emissive"},
+				"south": {"uv": [0, 0, 16, 16], "texture": "#cross_emissive"}
+			}
+		},
+		{
+			"from": [8, 4, 2.6],
+			"to": [8, 16, 13.4],
+			"shade": false,
+			"light_emission": 15,
+			"rotation": {"angle": 45, "axis": "y", "origin": [8, 8, 8], "rescale": true},
+			"faces": {
+				"east": {"uv": [0, 0, 16, 16], "texture": "#cross_emissive"},
+				"west": {"uv": [0, 0, 16, 16], "texture": "#cross_emissive"}
+			}
+		}
+	]
+}