Reapply "Merge branch 'update-1.21.9' of https://github.com/Gamemode4Dev/GM4_Datapacks into update-1.21.9"

This reverts commit c790085.

Author: TheThanathor

base/data/gm4/tags/block/waterloggable.json

@@ -1,7 +1,6 @@
 {
   "values": [
     "#minecraft:all_signs",
-    "minecraft:amethyst_cluster",
     {"id": "#minecraft:bars", "required": false},
     "#minecraft:campfires",
     "#minecraft:candles",
@@ -21,6 +20,7 @@
     "#minecraft:wall_signs",
     "#minecraft:walls",
     {"id": "#minecraft:wooden_shelves", "required": false},
+    "minecraft:amethyst_cluster",
     "minecraft:big_dripleaf",
     "minecraft:big_dripleaf_stem",
     "minecraft:black_stained_glass_pane",

gm4/plugins/manifest.py

@@ -21,7 +21,7 @@
 
 parent_logger = logging.getLogger("gm4.manifest")
 
-SUPPORTED_GAME_VERSIONS = ["1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9"]
+SUPPORTED_GAME_VERSIONS = ["1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"]
 
 # config models for beet.yaml metas
 CreditsModel = dict[str, list[str]]

gm4_crossbow_cartridges/data/gm4_crossbow_cartridges/function/projectile/copper_torch/place.mcfunction

@@ -3,8 +3,8 @@
 # at @s
 # run from projectile/copper_torch/check
 
-execute positioned ~.05 ~ ~ if predicate gm4_crossbow_cartridges:check_block/east run setblock ~-.1 ~ ~ minecraft:copper_wall_torch[facing=west]
-execute positioned ~ ~ ~.05 if predicate gm4_crossbow_cartridges:check_block/south run setblock ~ ~ ~-.1 minecraft:copper_wall_torch[facing=north]
-execute positioned ~-.05 ~ ~ if predicate gm4_crossbow_cartridges:check_block/west run setblock ~.1 ~ ~ minecraft:copper_wall_torch[facing=east]
-execute positioned ~ ~ ~-.05 if predicate gm4_crossbow_cartridges:check_block/north run setblock ~ ~ ~.1 minecraft:copper_wall_torch[facing=south]
-execute positioned ~ ~-.05 ~ if predicate gm4_crossbow_cartridges:check_block/below run setblock ~ ~.1 ~ minecraft:copper_torch
+execute positioned ~.1 ~ ~ if predicate gm4_crossbow_cartridges:check_block/east run setblock ~-.15 ~ ~ minecraft:copper_wall_torch[facing=west]
+execute positioned ~ ~ ~.1 if predicate gm4_crossbow_cartridges:check_block/south run setblock ~ ~ ~-.15 minecraft:copper_wall_torch[facing=north]
+execute positioned ~-.1 ~ ~ if predicate gm4_crossbow_cartridges:check_block/west run setblock ~.15 ~ ~ minecraft:copper_wall_torch[facing=east]
+execute positioned ~ ~ ~-.1 if predicate gm4_crossbow_cartridges:check_block/north run setblock ~ ~ ~.15 minecraft:copper_wall_torch[facing=south]
+execute positioned ~ ~-.1 ~ if predicate gm4_crossbow_cartridges:check_block/below run setblock ~ ~.15 ~ minecraft:copper_torch

gm4_disassemblers/beet.yaml

@@ -11,6 +11,12 @@ data_pack:
       min_format: 88
       max_format: 88
       directory: since_88
+    - formats:
+        min_inclusive: 81
+        max_inclusive: 88
+      min_format: 81
+      max_format: 88
+      directory: empty
 
 resource_pack:
   load: .

gm4_standard_crafting/beet.yaml

@@ -11,6 +11,12 @@ data_pack:
       min_format: 88
       max_format: 88
       directory: since_88
+    - formats:
+        min_inclusive: 81
+        max_inclusive: 88
+      min_format: 81
+      max_format: 88
+      directory: empty
 
 pipeline:
   - generate_recipes

pyproject.toml

@@ -7,7 +7,7 @@ authors = [
 ]
 requires-python = ">= 3.10, < 4.0"
 dependencies = [
-    "beet @ git+https://github.com/edayot/beet.git@update_1_21_9",
+    "beet >= 0.112.0",
     "mecha >= 0.99.0",
     "bolt >= 0.49.2",
     "PyYAML >= 6.0, < 7.0",