Merge remote-tracking branch 'upstream/master' into patch-9

docs/scarpet/Full.md

@@ -2954,7 +2954,7 @@ It returns a `map` with a report indicating how many chunks were affected, and h
 
 Adds a chunk ticket at a position, which makes the game to keep the designated area centered around
 `pos` with radius of `radius` loaded for a predefined amount of ticks, defined by `type`. Allowed types
-are `portal`: 300 ticks, `teleport`: 5 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
+are `portal`: 300 ticks, `teleport`: 40 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
 
 This function is tentative - will likely change when chunk ticket API is properly fleshed out.
 
@@ -4301,19 +4301,15 @@ Recipe type can take one of the following options:
  * `'smithing'` - smithing table (1.16+)
 
  The return value is a list of available recipes (even if there is only one recipe available). Each recipe contains of
- an item triple of the crafting result, list of ingredients, each containing a list of possible variants of the
- ingredients in this slot, as item triples, or `null` if its a shaped recipe and a given slot in the patterns is left
+ an item triple of the crafting results as a list of item stacks, list of ingredients, each containing a list of possible variants of the
+ ingredients in this slot, as item ids, or `null` if it is a shaped recipe and a given slot in the patterns is left
  empty, and recipe specification as another list. Possible recipe specs is:
   * `['shaped', width, height]` - shaped crafting. `width` and `height` can be 1, 2 or 3.
   * `['shapeless']` - shapeless crafting
   * `['smelting', duration, xp]` - smelting/cooking recipes
   * `['cutting']` - stonecutter recipe
   * `['special']` - special crafting recipe, typically not present in the crafting menu
   * `['custom']` - other recipe types
-
-Note that ingredients are specified as tripes, with count and nbt information. Currently all recipes require always one
-of the ingredients, and for some recipes, even if the nbt data for the ingredient is specified (e.g. `dispenser`), it
-can accept items of any tags.
 
 Also note that some recipes leave some products in the crafting window, and these can be determined using
  `crafting_remaining_item()` function 
@@ -4328,7 +4324,7 @@ Also note that some recipes leave some products in the crafting window, and thes
 ### `crafting_remaining_item(item)`
 
 returns `null` if the item has no remaining item in the crafting window when used as a crafting ingredient, or an
-item name that serves as a replacement after crafting is done. Currently it can only be buckets and glass bottles.
+item tuple that serves as a replacement after crafting is done. Currently, it can only be buckets and glass bottles.
 
 ### `inventory_size(inventory)`
 

docs/scarpet/api/BlocksAndWorldAccess.md

@@ -625,7 +625,7 @@ It returns a `map` with a report indicating how many chunks were affected, and h
 
 Adds a chunk ticket at a position, which makes the game to keep the designated area centered around
 `pos` with radius of `radius` loaded for a predefined amount of ticks, defined by `type`. Allowed types
-are `portal`: 300 ticks, `teleport`: 5 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
+are `portal`: 300 ticks, `teleport`: 40 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
 
 This function is tentative - will likely change when chunk ticket API is properly fleshed out.
 

docs/scarpet/api/Inventories.md

@@ -70,19 +70,15 @@ Recipe type can take one of the following options:
  * `'smithing'` - smithing table (1.16+)
 
  The return value is a list of available recipes (even if there is only one recipe available). Each recipe contains of
- an item triple of the crafting result, list of ingredients, each containing a list of possible variants of the
- ingredients in this slot, as item triples, or `null` if its a shaped recipe and a given slot in the patterns is left
+ an item triple of the crafting results as a list of item stacks, list of ingredients, each containing a list of possible variants of the
+ ingredients in this slot, as item ids, or `null` if it is a shaped recipe and a given slot in the patterns is left
  empty, and recipe specification as another list. Possible recipe specs is:
   * `['shaped', width, height]` - shaped crafting. `width` and `height` can be 1, 2 or 3.
   * `['shapeless']` - shapeless crafting
   * `['smelting', duration, xp]` - smelting/cooking recipes
   * `['cutting']` - stonecutter recipe
   * `['special']` - special crafting recipe, typically not present in the crafting menu
   * `['custom']` - other recipe types
-
-Note that ingredients are specified as tripes, with count and nbt information. Currently all recipes require always one
-of the ingredients, and for some recipes, even if the nbt data for the ingredient is specified (e.g. `dispenser`), it
-can accept items of any tags.
 
 Also note that some recipes leave some products in the crafting window, and these can be determined using
  `crafting_remaining_item()` function 
@@ -97,7 +93,7 @@ Also note that some recipes leave some products in the crafting window, and thes
 ### `crafting_remaining_item(item)`
 
 returns `null` if the item has no remaining item in the crafting window when used as a crafting ingredient, or an
-item name that serves as a replacement after crafting is done. Currently it can only be buckets and glass bottles.
+item tuple that serves as a replacement after crafting is done. Currently, it can only be buckets and glass bottles.
 
 ### `inventory_size(inventory)`
 

gradle.properties

@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=24w39a
-	loader_version=0.16.5
+	minecraft_version=24w44a
+	loader_version=0.16.7
 	jsr305_version=3.0.2
-	fabric_version=0.102.0+1.21
+	fabric_version=0.106.0+1.21.2
 
 # Mod Properties
-	mod_version = 1.4.154
+	mod_version = 1.4.159
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 
 # Release Action properties for Curseforge and Snapshots
 	# The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5)
 	# This is needed because CF uses too vague names for prereleases and release candidates
 	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
-	release-curse-versions = Minecraft 1.21.2:1.21.2-Snapshot
+	release-curse-versions = Minecraft 1.22:1.22.0-Snapshot
 	# Whether or not to build another branch on release
 	release-extra-branch = false
 	# The name of the second branch to release