Merge branch 'update-1.21.5' into ooa-1.21.5

Author: BPR02

base/beet.yaml

@@ -1,4 +1,4 @@
-version: 1.7.0
+version: 1.8.0
 id: gm4
 
 data_pack:

gm4/modeldata_registry.json

@@ -1330,7 +1330,13 @@
       "gm4_auto_crafting:item/auto_crafter": 140
     },
     "poisonous_potato": {
-      "gm4_chairs:gui/advancement/chairs_sit": 1
+      "gm4_chairs:gui/advancement/chairs_sit": 1,
+      "gm4_heart_canisters:gui/advancement/heart_canisters_tier_1": 4,
+      "gm4_heart_canisters:gui/advancement/heart_canisters_tier_2": 5,
+      "gm4_heart_canisters:gui/advancement/heart_canisters_max": 6,
+      "gm4_heart_canisters:item/heart_canister_tier_1": 7,
+      "gm4_heart_canisters:item/heart_canister_tier_2": 8,
+      "gm4_heart_canisters:guidebook_icon/heart_canisters": 10
     },
     "poppy": {
       "gm4_sweethearts:gui/advancement/sweethearts": 1,

gm4/plugins/resource_pack.py

@@ -1,6 +1,6 @@
 id: gm4_animi_shamir
 name: Animi Shamir
-version: 1.4.X
+version: 1.5.X
 
 data_pack:
   load: .
@@ -18,8 +18,8 @@ meta:
   gm4:
     versioning:
       required:
-        gm4_metallurgy: 1.4.0
-        lib_player_death: 1.2.0
+        gm4_metallurgy: 1.5.0
+        lib_player_death: 1.3.0
       schedule_loops: [main]
     model_data:
       - reference: shamir/animi

gm4_animi_shamir/beet.yaml

@@ -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

@@ -1,6 +1,6 @@
 id: gm4_apple_trees
 name: Apple Trees
-version: 2.4.X
+version: 2.5.X
 
 data_pack:
   load: .
@@ -17,8 +17,8 @@ meta:
   gm4:
     versioning:
       required:
-        lib_trades: 1.5.0
-        lib_trees: 1.2.0
+        lib_trades: 1.6.0
+        lib_trees: 1.3.0
       schedule_loops:
         - main
         - slow_clock

gm4_apple_trees/beet.yaml

@@ -1,6 +1,6 @@
 id: gm4_audere_shamir
 name: Audere Shamir
-version: 1.4.X
+version: 1.5.X
 
 data_pack:
   load: .
@@ -16,7 +16,7 @@ meta:
   gm4:
     versioning:
       required:
-        gm4_metallurgy: 1.4.0
+        gm4_metallurgy: 1.5.0
       schedule_loops: [main]
     model_data:
       - item: tools

gm4_audere_shamir/beet.yaml

@@ -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.