Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21

Author: rubensworks

AGENTS.md

@@ -69,6 +69,14 @@ When adding new features or fixing bugs:
 - **Always** add game tests when the feature interacts with Minecraft gameplay systems
 - Look at existing tests in the respective directories for examples of test patterns and conventions
 
+### Testing advancements
+
+When writing game tests for advancements, don't just call criterion triggers directly, but try to simulate actual game logic to invoke the criterion triggers indirectly.
+
+### Test coverage
+
+When adding new tests for the sake of increasing test coverage, you can measure coverage by running `./gradlew test runGameTestServer jacocoTestReport`, and checking the coverage output in `build/reports/jacoco/test/`.
+
 ## Building the Project
 
 ### Prerequisites
@@ -132,8 +140,6 @@ ln -s ../../scripts/pre-commit .git/hooks/pre-commit
 6. **Format code**: `./gradlew spotlessApply`
 7. **Commit**: Use clear, descriptive commit messages
 
-## Project Dependencies
-
 ## Release Management
 
 Version bumping and release management helper scripts are available in the [CyclopsMC/ReleaseHelpers](https://github.com/CyclopsMC/ReleaseHelpers) repository. These bash scripts assist with:
@@ -180,3 +186,18 @@ See `.github/workflows/ci.yml` for the full CI configuration.
 3. **Multi-loader compatibility**: Ensure changes work across all supported loaders
 4. **Build validation**: Never commit without running `build` (and `runGameTestServer` for MC 1.21+)
 5. **Code quality**: Follow existing patterns and conventions in the codebase
+
+## Code changes across Minecraft updates
+
+When I ask you to things such as "fix upmerge issues" or "update to the next Minecraft version",
+this means that I want you to help resolve compilation errors
+that were introduced due to upmerging code from an older minecraft version to a newer minecraft version.
+The old minecraft version can be found in the `.upmerge-src-branch` file of the parent directory,
+and the new minecraft version can be found in `gradle.properties`.
+Changes may also include fixing merge conflicts.
+
+IMPORTANT: Some changes may be non-trivial,
+for which you can find detail background information for each seperate Minecraft update within these primers: https://github.com/neoforged/.github/tree/main/primers
+The blogs of https://neoforged.net/ and https://fabricmc.net/blog/ may also contain useful porting help.
+
+After making all necessary changes, make sure the code fully compiles and the (game) tests pass.

CHANGELOG-1.20.1.md

@@ -1,8 +1,23 @@
 # Changelog for Minecraft 1.20.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.20.1-1.4.5"></a>
+## [1.20.1-1.4.5](/compare/1.20.1-1.4.4...1.20.1-1.4.5) - 2026-03-09 08:58:52
+
+
+### Fixed
+* Fix the reusable ingredients in chains of recipes blocking each other (#187)
+
+If the same reusable ingredient would be used within a chain of dependent
+recipes, the ingredient could be used in a dependent recipe, thereby blocking
+the dependency recipe.
+
+This change ensures that dependency-less recipes first get to use the reusable ingredients.
+
+Closes #182
+
 <a name="1.20.1-1.4.4"></a>
-## [1.20.1-1.4.4](/compare/1.20.1-1.4.3...1.20.1-1.4.4) - 2026-02-12 16:47:55
+## [1.20.1-1.4.4](/compare/1.20.1-1.4.3...1.20.1-1.4.4) - 2026-02-12 16:47:55 +0100
 
 
 ### Fixed

CHANGELOG-1.21.1.md

@@ -1,8 +1,25 @@
 # Changelog for Minecraft 1.21.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.21.1-1.4.5"></a>
+## [1.21.1-1.4.5](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.4...1.21.1-1.4.5) - 2026-03-09 16:17:51
+
+
+### Added
+* Add translations through Crowdin (#181)
+
+### Fixed
+* Fix the reusable ingredients in chains of recipes blocking each other (#187)
+  If the same reusable ingredient would be used within a chain of dependent
+  recipes, the ingredient could be used in a dependent recipe, thereby blocking
+  the dependency recipe.
+  This change ensures that dependency-less recipes first get to use the reusable ingredients.
+  Closes #182
+* Fix craft_planks.json: use "items" instead of "item" for MC 1.21 item predicate format
+* Fix insert_recipe_planks advancement condition
+
 <a name="1.21.1-1.4.4"></a>
-## [1.21.1-1.4.4](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.3...1.21.1-1.4.4) - 2026-02-12 16:49:31
+## [1.21.1-1.4.4](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.3...1.21.1-1.4.4) - 2026-02-12 16:49:31 +0100
 
 
 ### Fixed

resources/changelog/1.20.1-1.4.5.txt

@@ -0,0 +1,13 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Fixes:
+* Fix the reusable ingredients in chains of recipes blocking each other (#187)
+
+If the same reusable ingredient would be used within a chain of dependent
+recipes, the ingredient could be used in a dependent recipe, thereby blocking
+the dependency recipe.
+
+This change ensures that dependency-less recipes first get to use the reusable ingredients.
+
+Closes #182

resources/changelog/1.21.1-1.4.5.txt

@@ -0,0 +1,15 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.26.2 or higher.
+
+Additions:
+* Add translations through Crowdin (#181)
+
+Fixes:
+* Fix the reusable ingredients in chains of recipes blocking each other (#187)
+  If the same reusable ingredient would be used within a chain of dependent
+  recipes, the ingredient could be used in a dependent recipe, thereby blocking
+  the dependency recipe.
+  This change ensures that dependency-less recipes first get to use the reusable ingredients.
+  Closes #182
+* Fix craft_planks.json: use "items" instead of "item" for MC 1.21 item predicate format
+* Fix insert_recipe_planks advancement condition