PRE22

5 files changed, 0 insertions, 211 deletions

diff --git a/src/main/resources/assets/notenoughupdates/custom_ench_colour.png b/src/main/resources/assets/notenoughupdates/custom_ench_colour.png
index 2c1c717e..d797743c 100644
--- a/src/main/resources/assets/notenoughupdates/custom_ench_colour.png
+++ b/src/main/resources/assets/notenoughupdates/custom_ench_colour.png
diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/elephant.png b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/elephant.png
deleted file mode 100644
index 0a8a46f0..00000000
--- a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/elephant.png
+++ /dev/null
diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/moul_hat.json b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/moul_hat.json
deleted file mode 100644
index 517fb881..00000000
--- a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/moul_hat.json
+++ /dev/null
@@ -1,204 +0,0 @@
-{
-	"credit": "for some random ass australian",
-	"textures": {
-		"0": "australia/spartan",
-		"particle": "australia/spartan"
-	},
-	"elements": [
-		{
-			"from": [4, -1, 12],
-			"to": [12, 5, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 7, 20]},
-			"faces": {
-				"north": {"uv": [9.75, 2.5, 11.75, 4], "texture": "#0"},
-				"east": {"uv": [0, 0, 1, 6], "texture": "#missing"},
-				"south": {"uv": [9.75, 2.5, 11.75, 4], "texture": "#0"},
-				"west": {"uv": [0, 0, 1, 6], "texture": "#missing"},
-				"up": {"uv": [1.75, 5, 2, 7], "texture": "#0"},
-				"down": {"uv": [4, 2.5, 4.5, 2.75], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 4, 4],
-			"to": [12, 5, 12],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]},
-			"faces": {
-				"north": {"uv": [0, 0, 8, 1], "texture": "#missing"},
-				"east": {"uv": [0, 0, 8, 1], "texture": "#missing"},
-				"south": {"uv": [0, 0, 8, 1], "texture": "#missing"},
-				"west": {"uv": [0, 0, 8, 1], "texture": "#missing"},
-				"up": {"uv": [0.25, 5.25, 1.75, 6.75], "texture": "#0"},
-				"down": {"uv": [0.25, 5.25, 1.75, 6.75], "texture": "#0"}
-			}
-		},
-		{
-			"from": [4, 2, 3],
-			"to": [12, 5, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 10, 11]},
-			"faces": {
-				"north": {"uv": [4, 2.5, 6, 3.25], "texture": "#0"},
-				"east": {"uv": [0, 0, 1, 3], "texture": "#missing"},
-				"south": {"uv": [0, 0, 8, 3], "texture": "#missing"},
-				"west": {"uv": [0, 0, 1, 3], "texture": "#missing"},
-				"up": {"uv": [1.75, 5, 2, 7], "texture": "#0"},
-				"down": {"uv": [0, 0, 8, 1], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [4, -6, 3],
-			"to": [6, 0, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 2, 11]},
-			"faces": {
-				"north": {"uv": [1, 2.5, 1.5, 4], "texture": "#0"},
-				"east": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"},
-				"south": {"uv": [0, 2.5, 0.5, 4], "texture": "#0"},
-				"west": {"uv": [3.25, 2.5, 3.5, 3.25], "texture": "#0"},
-				"up": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"},
-				"down": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [10, -6, 3],
-			"to": [12, 0, 4],
-			"rotation": {"angle": 0, "axis": "y", "origin": [18, 2, 11]},
-			"faces": {
-				"north": {"uv": [0, 2.5, 0.5, 4], "texture": "#0"},
-				"east": {"uv": [3.25, 2.5, 3.5, 3.25], "texture": "#0"},
-				"south": {"uv": [1, 2.5, 1.5, 4], "texture": "#0"},
-				"west": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"},
-				"up": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"},
-				"down": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, -1, 3.5],
-			"to": [9, 2, 4.5],
-			"rotation": {"angle": 0, "axis": "y", "origin": [15, 7, 11]},
-			"faces": {
-				"north": {"uv": [3, 2.5, 3.5, 3.25], "texture": "#0"},
-				"east": {"uv": [3, 2.5, 3.25, 3.25], "texture": "#0"},
-				"south": {"uv": [3, 2.5, 3.5, 3.25], "texture": "#0"},
-				"west": {"uv": [3, 2.5, 3.25, 3.25], "texture": "#0"},
-				"up": {"uv": [0, 0, 2, 1], "texture": "#missing"},
-				"down": {"uv": [13.5, 2.75, 14, 3], "texture": "#0"}
-			}
-		},
-		{
-			"from": [3, -4, 3],
-			"to": [4, 5, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 4, 11]},
-			"faces": {
-				"north": {"uv": [6, 2.5, 6.25, 4.75], "texture": "#0"},
-				"east": {"uv": [13.5, 2.5, 14.75, 4.75], "texture": "#0"},
-				"south": {"uv": [0, 0, 1, 9], "texture": "#missing"},
-				"west": {"uv": [6.75, 2.5, 8, 4.75], "texture": "#0"},
-				"up": {"uv": [1.75, 5, 2, 7], "texture": "#0"},
-				"down": {"uv": [0, 0, 1, 5], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [12, -4, 3],
-			"to": [13, 5, 8],
-			"rotation": {"angle": 0, "axis": "y", "origin": [20, 4, 11]},
-			"faces": {
-				"north": {"uv": [6, 2.5, 6.25, 4.75], "texture": "#0"},
-				"east": {"uv": [13.5, 2.5, 14.75, 4.75], "texture": "#0"},
-				"south": {"uv": [0, 0, 1, 9], "texture": "#missing"},
-				"west": {"uv": [6.75, 2.5, 8, 4.75], "texture": "#0"},
-				"up": {"uv": [1.75, 5, 2, 7], "texture": "#0"},
-				"down": {"uv": [0, 0, 1, 5], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [3, -2, 8],
-			"to": [4, 5, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [11, 6, 16]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 7], "texture": "#missing"},
-				"east": {"uv": [12.25, 2.5, 13.5, 4.25], "texture": "#0"},
-				"south": {"uv": [6, 2.5, 6.25, 4.25], "texture": "#0"},
-				"west": {"uv": [8, 2.5, 9.25, 4.25], "texture": "#0"},
-				"up": {"uv": [1.75, 5, 2, 7], "texture": "#0"},
-				"down": {"uv": [0, 0, 1, 5], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [12, -2, 8],
-			"to": [13, 5, 13],
-			"rotation": {"angle": 0, "axis": "y", "origin": [20, 6, 16]},
-			"faces": {
-				"north": {"uv": [0, 0, 1, 7], "texture": "#missing"},
-				"east": {"uv": [12.25, 2.5, 13.5, 4.25], "texture": "#0"},
-				"south": {"uv": [6, 2.5, 6.25, 4.25], "texture": "#0"},
-				"west": {"uv": [8, 2.5, 9.25, 4.25], "texture": "#0"},
-				"up": {"uv": [1.75, 5, 2, 7], "texture": "#0"},
-				"down": {"uv": [0, 0, 1, 5], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [4, -1, 13],
-			"to": [12, 0, 16],
-			"rotation": {"angle": 0, "axis": "y", "origin": [12, 7, 21]},
-			"faces": {
-				"north": {"uv": [0, 0, 8, 1], "texture": "#missing"},
-				"east": {"uv": [4, 2.5, 4.5, 2.75], "texture": "#0"},
-				"south": {"uv": [9.75, 3.75, 11.75, 4], "texture": "#0"},
-				"west": {"uv": [4, 2.5, 4.5, 2.75], "texture": "#0"},
-				"up": {"uv": [9.75, 3.25, 11.75, 4], "texture": "#0"},
-				"down": {"uv": [9.75, 3.75, 11.75, 4.5], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7, 5.7, 2],
-			"to": [9, 14.7, 8],
-			"rotation": {"angle": -22.5, "axis": "x", "origin": [15, 14, 10]},
-			"faces": {
-				"north": {"uv": [2, 0, 2.5, 2.25], "texture": "#0"},
-				"east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"},
-				"south": {"uv": [0, 0, 2, 9], "texture": "#missing"},
-				"west": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"},
-				"up": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"},
-				"down": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.01, 4.88135, 7.88436],
-			"to": [8.99, 13.88135, 13.88436],
-			"rotation": {"angle": 0, "axis": "x", "origin": [15.01, 13.18135, 15.88436]},
-			"faces": {
-				"north": {"uv": [0, 0, 1.98, 9], "texture": "#missing"},
-				"east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"},
-				"south": {"uv": [0, 0, 1.98, 9], "texture": "#missing"},
-				"west": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"},
-				"up": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"},
-				"down": {"uv": [0, 0, 1.98, 6], "texture": "#missing"}
-			}
-		},
-		{
-			"from": [7.02, -0.57048, 11.04624],
-			"to": [8.98, 8.42952, 17.04624],
-			"rotation": {"angle": 45, "axis": "x", "origin": [15.02, 7.72952, 19.04624]},
-			"faces": {
-				"north": {"uv": [0, 0, 1.96, 9], "texture": "#missing"},
-				"east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"},
-				"south": {"uv": [0, 0, 1.96, 9], "texture": "#missing"},
-				"west": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"},
-				"up": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"},
-				"down": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"}
-			}
-		},
-		{
-			"from": [7.03, 3.63871, 12.127],
-			"to": [8.97, 9.63871, 18.127],
-			"rotation": {"angle": 0, "axis": "x", "origin": [15, 17.33871, 19.127]},
-			"faces": {
-				"north": {"uv": [0, 0, 1.94, 9], "rotation": 180, "texture": "#missing"},
-				"east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"},
-				"south": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"},
-				"west": {"uv": [0, 0.75, 1.5, 2.25], "rotation": 90, "texture": "#0"},
-				"up": {"uv": [0, 0, 1.94, 6], "texture": "#missing"},
-				"down": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"}
-			}
-		}
-	]
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/spartan.png b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/spartan.png
deleted file mode 100644
index 95d484e3..00000000
--- a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/spartan.png
+++ /dev/null
diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/customskull.json b/src/main/resources/assets/notenoughupdates/custom_skull_textures/customskull.json
deleted file mode 100644
index dddd7878..00000000
--- a/src/main/resources/assets/notenoughupdates/custom_skull_textures/customskull.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "comment": "custom models override textures, remove the 'model' part below to make it use the elephant texture",
-    "f69ba621-a8b6-31a7-8de1-dc7ade140e1d": {
-		"model": "australia/moul_hat",
-		"texture": "australia/elephant"
-	}
-}
\ No newline at end of file