Fix merge error

OroArmorModding · Feb 6, 2021 · eabfa7c · eabfa7c
1 parent d8a3848
commit eabfa7c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/fishing_rod",
+  "parent": "item/generated",
   "textures": {
     "layer0": "netherite_plus:item/netherite_fishing_rod"
   },