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

Author: rubensworks

.github/workflows/publish-github-release.yml

@@ -9,6 +9,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Release
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
+        with:
+          body_path: CHANGELOG.md

CHANGELOG-1.19.2.md

@@ -0,0 +1,29 @@
+# Changelog for Minecraft 1.19.2
+All notable changes to this project will be documented in this file.
+
+<a name="1.19.2-0.2.7"></a>
+## [1.19.2-0.2.7](/compare/1.19.2-0.2.6...1.19.2-0.2.7) - 2025-09-13 13:35:31
+
+
+### Fixed
+* Fix crash when CommonCapabilities is not present, Closes #45
+
+<a name="1.19.2-0.2.6"></a>
+## [1.19.2-0.2.6](/compare/1.19.2-0.2.5...1.19.2-0.2.6) - 2023-11-27 11:21:01 +0100
+
+
+### Fixed
+* Fix duping with compound chests, Closes #33
+
+<a name="1.19.2-0.2.5"></a>
+## [1.19.2-0.2.5](/compare/1.19.2-0.2.4...1.19.2-0.2.5) - 2023-02-12 05:31:17 +0100
+
+
+### Fixed
+* Fix input not consumed if output can not fully fit, Closes #31
+
+<a name="1.19.2-0.2.4"></a>
+## [1.19.2-0.2.4] - 2022-08-11 19:47:32 +0200
+
+
+Update to MC 1.19.2

CHANGELOG-1.20.1.md

@@ -0,0 +1,22 @@
+# Changelog for Minecraft 1.20.1
+All notable changes to this project will be documented in this file.
+
+<a name="1.20.1-0.2.7"></a>
+## [1.20.1-0.2.7](/compare/1.20.1-0.2.6...1.20.1-0.2.7) - 2025-09-13 13:37:56
+
+
+### Fixed
+* Fix crash when CommonCapabilities is not present, Closes #45
+
+<a name="1.20.1-0.2.6"></a>
+## [1.20.1-0.2.6](/compare/1.20.1-0.2.5...1.20.1-0.2.6) - 2023-11-27 11:24:50 +0100
+
+
+### Fixed
+* Fix duping with compound chests, Closes #33
+
+<a name="1.20.1-0.2.5"></a>
+## [1.20.1-0.2.5] - 2023-07-02 08:10:02 +0200
+
+
+Initial 1.20.1 release

CHANGELOG-1.21.1.md

@@ -0,0 +1,58 @@
+# Changelog for Minecraft 1.21.1
+All notable changes to this project will be documented in this file.
+
+<a name="1.21.1-0.2.13"></a>
+## [1.21.1-0.2.13](https://github.com/CyclopsMC/StructuredCrafting/compare/1.21.1-0.2.12...1.21.1-0.2.13) - 2025-09-13 13:42:12
+
+
+### Fixed
+* Fix crash when CommonCapabilities is not present, Closes #45
+
+<a name="1.21.1-0.2.12"></a>
+## [1.21.1-0.2.12](https://github.com/CyclopsMC/StructuredCrafting/compare/1.21.1-0.2.11...1.21.1-0.2.12) - 2025-05-25 07:17:37 +0200
+
+
+### Fixed
+* Fix multi-output recipes voiding > 1 in Fabric, Closes #44
+
+<a name="1.21.1-0.2.11"></a>
+## [1.21.1-0.2.11](https://github.com/CyclopsMC/StructuredCrafting/compare/1.21.1-0.2.10...1.21.1-0.2.11) - 2025-05-12 16:53:09 +0200
+
+
+### Fixed
+* Fix crash with reusable items in a vertical pattern, Closes #42
+
+<a name="1.21.1-0.2.10"></a>
+## [1.21.1-0.2.10](https://github.com/CyclopsMC/StructuredCrafting/compare/1.21.1-0.2.9...1.21.1-0.2.10) - 2025-05-11 13:34:28 +0200
+
+
+### Fixed
+* Fix offset for recipes with reusable inputs, Closes #42
+
+<a name="1.21.1-0.2.9"></a>
+## [1.21.1-0.2.9](https://github.com/CyclopsMC/StructuredCrafting/compare/1.21.1-0.2.8...1.21.1-0.2.9) - 2025-05-10 14:39:25 +0200
+
+
+### Fixed
+* Fix small recipes with reusable items failing, Closes #42
+
+<a name="1.21.1-0.2.8"></a>
+## [1.21.1-0.2.8](https://github.com/CyclopsMC/StructuredCrafting/compare/1.21.1-0.2.7...1.21.1-0.2.8) - 2025-05-07 19:21:25 +0200
+
+
+### Added
+* Add ja_jp translations
+* Add cs_cz translations
+* Add nl_nl translations
+* Add tr_tr translations
+
+### Fixed
+* Fix block not dropping when broken, Closes #41
+* Fix incorrect recipe on Fabric, Closes #43
+
+<a name="1.21.1-0.2.7"></a>
+## [1.21.1-0.2.7] - 2024-09-04 17:29:03 +0200
+
+
+### Changed
+* Refactor code to be compatible with NeoForge, Forge, and Fabric.

CHANGELOG.md

@@ -0,0 +1 @@
+CHANGELOG-1.21.1.md

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -46,7 +46,7 @@ def getModrinthKey() {
 }
 def getChangelog() {
     if (System.getenv().RELEASE) {
-        return file("../resources/changelog/${project.minecraft_version}-${project.mod_version}.txt").getText();
+        return file("../CHANGELOG-${project.minecraft_version}.md").getText();
     } else {
         return "Changes since last release: ${project.github_url}/compare/${project.minecraft_version}-${project.mod_version}...${System.getenv().GITHUB_SHA}"
     }

loader-neoforge/build.gradle

@@ -48,7 +48,7 @@ task publishCurseForge(type: TaskPublishCurseForge) {
     apiToken = secrets.curseforgeKey;
     def mainFile = upload(project.curseforge_project_id, jar)
     mainFile.releaseType = secrets.build_number.equals("RELEASE") ? Constants.RELEASE_TYPE_RELEASE : Constants.RELEASE_TYPE_BETA
-    mainFile.changelogType = "text"
+    mainFile.changelogType = "markdown"
     mainFile.changelog = secrets.changelog
     mainFile.addJavaVersion("Java ${project.java_version}")
     mainFile.addGameVersion(project.minecraft_version)

loader-neoforge/src/main/java/org/cyclops/structuredcrafting/StructuredCraftingNeoForge.java

@@ -45,7 +45,9 @@ protected void loadModCompats(ModCompatLoader modCompatLoader) {
         super.loadModCompats(modCompatLoader);
 
         // Capabilities
-        getCapabilityConstructorRegistry().registerBlockEntity(RegistryEntries.BLOCK_ENTITY_STRUCTURED_CRAFTER::value, new WorkerStructuredCrafterTileCompat());
+        if (getModHelpers().getMinecraftHelpers().isModLoaded("commoncapabilities")) {
+            getCapabilityConstructorRegistry().registerBlockEntity(RegistryEntries.BLOCK_ENTITY_STRUCTURED_CRAFTER::value, new WorkerStructuredCrafterTileCompat());
+        }
     }
 
     @Override

resources/changelog/1.19.2-0.2.7.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.17.0 or higher.
+
+Fixes:
+* Fix crash when CommonCapabilities is not present, Closes #45

resources/changelog/1.20.1-0.2.7.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Fixes:
+* Fix crash when CommonCapabilities is not present, Closes #45