Merge branch 'update-1.21.5' of https://github.com/Gamemode4Dev/GM4_Datapacks into mysterious-midnight-new-sound

Author: runcows

gm4/plugins/resource_pack.py

@@ -23,7 +23,7 @@
 							"lore": [
 								{
 									"translate": "item.gm4.shamir.animi",
-									"fallback": "Animi",
+									"fallback": "Animi Shamir",
 									"italic": false,
 									"color": "gray"
 								}

gm4_animi_shamir/data/gm4_animi_shamir/loot_table/band.json

@@ -1,5 +1,5 @@
 key,en_us
-item.gm4.shamir.animi,Animi
+item.gm4.shamir.animi,Animi Shamir
 text.gm4.guidebook.module_desc.animi_shamir,Adds the Animi Shamir to Metallurgy. Items with Animi will respawn with you when you die!
 text.gm4.guidebook.animi_shamir.description,Animi allows items to return to their owner upon death.
 text.gm4.guidebook.animi_shamir.usage,"The Animi Shamir is found on Curie's Bismium Bands. It can be placed onto tools, armour, weapons, and elytra.\n\nAnimi items do not drop when the owner dies, instead appearing in their inventory upon respawning."

gm4_animi_shamir/translations.csv

@@ -23,7 +23,7 @@
                             "lore": [
                                 {
                                     "translate": "item.gm4.shamir.audere",
-                                    "fallback": "Audere",
+                                    "fallback": "Audere Shamir",
                                     "italic": false,
                                     "color": "gray"
                                 }

gm4_audere_shamir/data/gm4_audere_shamir/loot_table/band.json

@@ -1,5 +1,5 @@
 key,en_us
-item.gm4.shamir.audere,Audere
+item.gm4.shamir.audere,Audere Shamir
 text.gm4.guidebook.module_desc.audere_shamir,Adds the shamir 'Audere' to Metallurgy. Gain Haste with low durability tools.
 text.gm4.guidebook.audere_shamir.description,"Audere buffs mining speed, as durability decreases."
 text.gm4.guidebook.audere_shamir.usage,The Audere Shamir is found on Barium Bands. It can be placed onto tools.\n\nHigher levels of Haste are awarded for lower durability (percentage-based).\n\nThe maximum level of Haste is IV.

gm4_audere_shamir/translations.csv

@@ -38,6 +38,4 @@ meta:
     model_data:
       - item: armor_stand
         reference: gui/advancement/better_armour_stands
-        template:
-          name: advancement
-          forward: minecraft:item/armor_stand
+        template: advancement

gm4_better_armour_stands/beet.yaml

@@ -39,6 +39,4 @@ meta:
         template: generated
       - item: bow
         reference: gui/advancement/better_fire
-        template:
-          name: advancement
-          forward: minecraft:item/bow
+        template: advancement

gm4_better_fire/beet.yaml

@@ -23,7 +23,7 @@
                             "lore": [
                                 {
                                     "translate": "item.gm4.shamir.celaro",
-                                    "fallback": "Celaro",
+                                    "fallback": "Celaro Shamir",
                                     "italic": false,
                                     "color": "gray"
                                 }

gm4_desire_lines/data/gm4_celaro_shamir/loot_table/band.json

@@ -1,5 +1,5 @@
 key,en_us
-item.gm4.shamir.celaro,Celaro
+item.gm4.shamir.celaro,Celaro Shamir
 advancement.gm4.desire_lines.walk_8000.title,And I Would Walk 500 Chunks...
 advancement.gm4.desire_lines.walk_8000.description,Ruin 8000 blocks to coarse dirt; you'll find those oak planks
 advancement.gm4.desire_lines.walk_10000.title,That's a Lot of Damage

gm4_desire_lines/translations.csv

@@ -26,16 +26,18 @@ meta:
         reference: item/enderpuff
       - item: elytra
         reference: item/captains_wings
-        model:
-          type: condition_broken
-          unbroken: item/elytra/captains_wings
-          broken: item/elytra/broken_captains_wings
+        template:
+          name: condition
+          property: minecraft:broken
+          on_true: item/elytra/broken_captains_wings
+          on_false: item/elytra/captains_wings
       - item: elytra
         reference: item/ravaged_wings
-        model:
-          type: condition_broken
-          unbroken: item/elytra/ravaged_wings
-          broken: item/elytra/broken_ravaged_wings
+        template:
+          name: condition
+          property: minecraft:broken
+          on_true: item/elytra/broken_ravaged_wings
+          on_false: item/elytra/ravaged_wings
       - item: fishing_rod
         reference: gui/advancement/end_fishing
         template: advancement