From eabfa7c181fa8e67f853047fee109f7619ad9ff3 Mon Sep 17 00:00:00 2001 From: OroArmor Date: Sat, 6 Feb 2021 13:47:43 -0800 Subject: [PATCH] Fix merge error --- .../assets/netherite_plus/models/item/netherite_bow.json | 2 +- .../assets/netherite_plus/models/item/netherite_crossbow.json | 2 +- .../netherite_plus/models/item/netherite_fishing_rod.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/resources/assets/netherite_plus/models/item/netherite_bow.json b/common/src/main/resources/assets/netherite_plus/models/item/netherite_bow.json index 2aed15f..0c7fa0d 100644 --- a/common/src/main/resources/assets/netherite_plus/models/item/netherite_bow.json +++ b/common/src/main/resources/assets/netherite_plus/models/item/netherite_bow.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/bow", + "parent": "item/generated", "textures": { "layer0": "netherite_plus:item/netherite_bow" }, diff --git a/common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow.json b/common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow.json index 55b8222..85c002e 100644 --- a/common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow.json +++ b/common/src/main/resources/assets/netherite_plus/models/item/netherite_crossbow.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/crossbow", + "parent": "item/generated", "textures": { "layer0": "netherite_plus:item/netherite_crossbow_standby" }, diff --git a/common/src/main/resources/assets/netherite_plus/models/item/netherite_fishing_rod.json b/common/src/main/resources/assets/netherite_plus/models/item/netherite_fishing_rod.json index 5adb680..17c218c 100644 --- a/common/src/main/resources/assets/netherite_plus/models/item/netherite_fishing_rod.json +++ b/common/src/main/resources/assets/netherite_plus/models/item/netherite_fishing_rod.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/fishing_rod", + "parent": "item/generated", "textures": { "layer0": "netherite_plus:item/netherite_fishing_rod" },