Fix merge error

OroArmor · OroArmor · commit eabfa7c181fa · 2021-02-06T13:47:43.000-08:00
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"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "parent": "minecraft:item/bow",`
	`2`	`+ "parent": "item/generated",`
`3`	`3`	`"textures": {`
`4`	`4`	`"layer0": "netherite_plus:item/netherite_bow"`
`5`	`5`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "parent": "minecraft:item/crossbow",`
	`2`	`+ "parent": "item/generated",`
`3`	`3`	`"textures": {`
`4`	`4`	`"layer0": "netherite_plus:item/netherite_crossbow_standby"`
`5`	`5`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "parent": "minecraft:item/fishing_rod",`
	`2`	`+ "parent": "item/generated",`
`3`	`3`	`"textures": {`
`4`	`4`	`"layer0": "netherite_plus:item/netherite_fishing_rod"`
`5`	`5`	`},`