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

Author: rubensworks

CHANGELOG-1.20.1.md

@@ -1,8 +1,15 @@
 # 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.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
+
+
+### Fixed
+* Fix crash on invalid Stone Cutter recipes, Closes #178
+
 <a name="1.20.1-1.4.3"></a>
-## [1.20.1-1.4.3](/compare/1.20.1-1.4.2...1.20.1-1.4.3) - 2026-02-01 14:22:50
+## [1.20.1-1.4.3](/compare/1.20.1-1.4.2...1.20.1-1.4.3) - 2026-02-01 14:22:50 +0100
 
 
 ### Fixed

CHANGELOG-1.21.1.md

@@ -1,8 +1,15 @@
 # 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.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
+
+
+### Fixed
+* Fix crash on invalid Stone Cutter recipes, Closes #178
+
 <a name="1.21.1-1.4.3"></a>
-## [1.21.1-1.4.3](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.2...1.21.1-1.4.3) - 2026-02-01 14:24:27
+## [1.21.1-1.4.3](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.2...1.21.1-1.4.3) - 2026-02-01 14:24:27 +0100
 
 
 ### Added

resources/changelog/1.20.1-1.4.4.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 on invalid Stone Cutter recipes, Closes #178

resources/changelog/1.21.1-1.4.4.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.26.2 or higher.
+
+Fixes:
+* Fix crash on invalid Stone Cutter recipes, Closes #178

src/main/java/org/cyclops/integratedcrafting/core/CraftingJobHandler.java

@@ -516,7 +516,11 @@ protected boolean insertCrafting(PartPos target, IMixedIngredients ingredients,
         // First check our crafting overrides
         for (ICraftingProcessOverride craftingProcessOverride : this.craftingProcessOverrides) {
             if (craftingProcessOverride.isApplicable(target)) {
-                return craftingProcessOverride.craft(targetGetter, ingredients, recipe, this.resultsSink, craftingJob, simulate);
+                try {
+                    return craftingProcessOverride.craft(targetGetter, ingredients, recipe, this.resultsSink, craftingJob, simulate);
+                } catch (IllegalArgumentException e) {
+                    return false;
+                }
             }
         }
 
@@ -530,7 +534,7 @@ protected void insertLoopNonBlocking(INetwork network, int channel, PartPos targ
             IRecipeDefinition recipe = craftingJob.getRecipe();
             IMixedIngredients ingredientsSimulated = CraftingHelpers.getRecipeInputsFromCraftingJobBuffer(craftingJob,
                     recipe, true, 1);
-            if (ingredientsSimulated == null ||!insertCrafting(targetPos, ingredientsSimulated, recipe, craftingJob, network, channel, true)) {
+            if (ingredientsSimulated == null || !insertCrafting(targetPos, ingredientsSimulated, recipe, craftingJob, network, channel, true)) {
                 break;
             }
             if (!consumeAndInsertCrafting(true, network, channel, targetPos, craftingJob)) {