Merge and fix

src/main/resources/assets/betterend/models/item/aeternium_axe.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/aeternium_axe"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/aeternium_axe"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_boots.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/aeternium_boots"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/aeternium_boots"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_chestplate.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/aeternium_chestplate"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/aeternium_chestplate"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_hammer.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/aeternium_hammer"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/aeternium_hammer"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_helmet.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/aeternium_helmet"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/aeternium_helmet"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_hoe.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/aeternium_hoe"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/aeternium_hoe"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_leggings.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/aeternium_leggings"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/aeternium_leggings"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/aeternium_pickaxe"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/aeternium_pickaxe"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_shovel.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/aeternium_shovel"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/aeternium_shovel"
+	}
 }

src/main/resources/assets/betterend/models/item/aeternium_sword.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/aeternium_sword"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/aeternium_sword"
+	}
 }

src/main/resources/assets/betterend/models/item/cave_bush.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/cave_bush_01"
-}
+{
+	"parent": "betterend:block/cave_bush_01"
+}

src/main/resources/assets/betterend/models/item/cave_moss.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/cave_moss"
-}
+{
+	"parent": "betterend:block/cave_moss"
+}

src/main/resources/assets/betterend/models/item/cave_moss_path.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/cave_moss_path"
-}
+{
+	"parent": "betterend:block/cave_moss_path"
+}

src/main/resources/assets/betterend/models/item/crystal_moss.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/crystal_moss"
-}
+{
+	"parent": "betterend:block/crystal_moss"
+}

src/main/resources/assets/betterend/models/item/crystal_moss_path.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/crystal_moss_path"
-}
+{
+	"parent": "betterend:block/crystal_moss_path"
+}

src/main/resources/assets/betterend/models/item/diamond_hammer.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/diamond_hammer"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/diamond_hammer"
+	}
 }

src/main/resources/assets/betterend/models/item/end_lotus_stem.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/end_lotus_stem"
-}
+{
+	"parent": "betterend:block/end_lotus_stem"
+}

src/main/resources/assets/betterend/models/item/end_portal_block.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:block/end_portal"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:block/end_portal"
+	}
 }

src/main/resources/assets/betterend/models/item/eternal_crystal.json

@@ -1,6 +1,6 @@
-{
-	"parent": "item/generated",
-	"textures": {
-		"layer0": "betterend:item/crystal_shards"
-	}
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:item/crystal_shards"
+	}
 }

src/main/resources/assets/betterend/models/item/eternal_pedestal.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/eternal_pedestal_default_1"
-}
+{
+	"parent": "betterend:block/eternal_pedestal_default_1"
+}

src/main/resources/assets/betterend/models/item/flavolite_runed.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/flavolite_runed_1"
-}
+{
+	"parent": "betterend:block/flavolite_runed_1"
+}

src/main/resources/assets/betterend/models/item/flavolite_runed_eternal.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/flavolite_runed_1"
-}
+{
+	"parent": "betterend:block/flavolite_runed_1"
+}

src/main/resources/assets/betterend/models/item/golden_hammer.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/golden_hammer"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/golden_hammer"
+	}
 }

src/main/resources/assets/betterend/models/item/infusion_pedestal.json

@@ -1,3 +1,3 @@
-{
-	"parent": "betterend:block/infusion_pedestal_default"
-}
+{
+	"parent": "betterend:block/infusion_pedestal_default"
+}

src/main/resources/assets/betterend/models/item/iron_hammer.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/iron_hammer"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/iron_hammer"
+	}
 }

src/main/resources/assets/betterend/models/item/netherite_hammer.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/netherite_hammer"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/netherite_hammer"
+	}
 }

src/main/resources/assets/betterend/models/item/purpur_pedestal.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/purpur_pedestal_default"
-}
+{
+    "parent": "betterend:block/purpur_pedestal_default"
+}

src/main/resources/assets/betterend/models/item/quartz_pedestal.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/quartz_pedestal_default"
-}
+{
+    "parent": "betterend:block/quartz_pedestal_default"
+}

src/main/resources/assets/betterend/models/item/spawn_egg_dragonfly.json

@@ -1,3 +1,3 @@
-{
-    "parent": "item/template_spawn_egg"
-}
+{
+    "parent": "item/template_spawn_egg"
+}

src/main/resources/assets/betterend/models/item/spawn_egg_end_slime.json

@@ -1,3 +1,3 @@
-{
-    "parent": "item/template_spawn_egg"
-}
+{
+    "parent": "item/template_spawn_egg"
+}

src/main/resources/assets/betterend/models/item/spawn_egg_shadow_walker.json

@@ -0,0 +1,3 @@
+{
+    "parent": "item/template_spawn_egg"
+}

src/main/resources/assets/betterend/models/item/terminite_axe.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/terminite_axe"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/terminite_axe"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_boots.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/terminite_boots"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/terminite_boots"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_chestplate.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/terminite_chestplate"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/terminite_chestplate"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_hammer.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/terminite_hammer"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/terminite_hammer"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_helmet.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/terminite_helmet"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/terminite_helmet"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_hoe.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/terminite_hoe"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/terminite_hoe"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_leggings.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/generated",
-	"textures": {
-		"layer0": "betterend:item/terminite_leggings"
-	}
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "betterend:item/terminite_leggings"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_pickaxe.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/terminite_pickaxe"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/terminite_pickaxe"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_shovel.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/terminite_shovel"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/terminite_shovel"
+	}
 }

src/main/resources/assets/betterend/models/item/terminite_sword.json

@@ -1,6 +1,6 @@
-{
-	"parent": "minecraft:item/handheld",
-	"textures": {
-		"layer0": "betterend:item/terminite_sword"
-	}
+{
+	"parent": "minecraft:item/handheld",
+	"textures": {
+		"layer0": "betterend:item/terminite_sword"
+	}
 }

src/main/resources/assets/betterend/models/item/violecite.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite"
-}
+{
+    "parent": "betterend:block/violecite"
+}

src/main/resources/assets/betterend/models/item/violecite_bricks.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_bricks"
-}
+{
+    "parent": "betterend:block/violecite_bricks"
+}

src/main/resources/assets/betterend/models/item/violecite_bricks_slab.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_bricks_half_slab"
-}
+{
+    "parent": "betterend:block/violecite_bricks_half_slab"
+}

src/main/resources/assets/betterend/models/item/violecite_bricks_stairs.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_bricks_stairs"
-}
+{
+    "parent": "betterend:block/violecite_bricks_stairs"
+}

src/main/resources/assets/betterend/models/item/violecite_bricks_wall.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_bricks_wall_inventory"
-}
+{
+    "parent": "betterend:block/violecite_bricks_wall_inventory"
+}

src/main/resources/assets/betterend/models/item/violecite_button.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_button_inventory"
-}
+{
+    "parent": "betterend:block/violecite_button_inventory"
+}

src/main/resources/assets/betterend/models/item/violecite_pillar.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_pillar"
-}
+{
+    "parent": "betterend:block/violecite_pillar"
+}

src/main/resources/assets/betterend/models/item/violecite_plate.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_pressure_plate_up"
-}
+{
+    "parent": "betterend:block/violecite_pressure_plate_up"
+}

src/main/resources/assets/betterend/models/item/violecite_slab.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_half_slab"
-}
+{
+    "parent": "betterend:block/violecite_half_slab"
+}

src/main/resources/assets/betterend/models/item/violecite_small_tiles.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_small_tiles"
-}
+{
+    "parent": "betterend:block/violecite_small_tiles"
+}

src/main/resources/assets/betterend/models/item/violecite_stairs.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_stairs"
-}
+{
+    "parent": "betterend:block/violecite_stairs"
+}

src/main/resources/assets/betterend/models/item/violecite_tile.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_tile"
-}
+{
+    "parent": "betterend:block/violecite_tile"
+}

src/main/resources/assets/betterend/models/item/violecite_wall.json

@@ -1,3 +1,3 @@
-{
-    "parent": "betterend:block/violecite_wall_inventory"
-}
+{
+    "parent": "betterend:block/violecite_wall_inventory"
+}