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

Author: rubensworks

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.2"></a>
+## [1.20.1-1.4.2](/compare/1.20.1-1.4.1...1.20.1-1.4.2) - 2026-01-17 14:14:28
+
+
+### Fixed
+* Fix formatting of some exception messages (#173)
+
+<a name="1.20.1-1.4.1"></a>
+## [1.20.1-1.4.1](/compare/1.20.1-1.4.0...1.20.1-1.4.1) - 2026-01-02 10:55:58 +0100
+
+
+### Fixed
+* Fix crafting storage not dropping when breaking crafting interfaces
+* Fix crafting job completion when using importers, Closes #170
+
 <a name="1.20.1-1.4.0"></a>
-## [1.20.1-1.4.0](/compare/1.20.1-1.3.3...1.20.1-1.4.0) - 2025-12-31 14:42:03
+## [1.20.1-1.4.0](/compare/1.20.1-1.3.3...1.20.1-1.4.0) - 2025-12-31 15:03:05 +0100
 
 
 ### Changed

resources/changelog/1.20.1-1.4.1.txt

@@ -0,0 +1,7 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.18.4 or higher.
+
+Fixes:
+* Fix crafting storage not dropping when breaking crafting interfaces
+* Fix crafting job completion when using importers, Closes #170
+

resources/changelog/1.20.1-1.4.2.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 formatting of some exception messages (#173)

src/main/java/org/cyclops/integratedcrafting/api/crafting/CraftingJob.java

@@ -154,7 +154,7 @@ public <T, M> void addToIngredientsStorageBuffer(IngredientComponent<T, M> ingre
             }
             T remaining = new IngredientComponentStorageSlottedCollectionWrapper<>(new IngredientList<>(ingredientComponent, instances), Integer.MAX_VALUE, Integer.MAX_VALUE).insert(instance, false);
             if (!matcher.isEmpty(remaining)) {
-                throw new IllegalStateException(String.format("Unable to insert %s into the crafting job buffer, remaining: ", instances, remaining));
+                throw new IllegalStateException(String.format("Unable to insert %s into the crafting job buffer, remaining: %s", instances, remaining));
             }
         }
 

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

@@ -1166,9 +1166,9 @@ public static <T, M> List<T> getIngredientRecipeInputs(IIngredientComponentStora
                     for (T instance : inputInstances) {
                         T remaining = storage.insert(instance, false);
                         if (!matcher.isEmpty(remaining)) {
-                            throw new IllegalStateException("Extraction for a crafting recipe failed" +
+                            throw new IllegalStateException(String.format("Extraction for a crafting recipe failed " +
                                     "due to inconsistent insertion behaviour by destination in simulation " +
-                                    "and non-simulation: " + storage + ". Lost: " + remaining);
+                                    "and non-simulation: %s. Lost: %s", storage, remaining));
                         }
                     }
                 }
@@ -1610,9 +1610,9 @@ public static <T, M, C> boolean insertIngredientCrafting(IngredientComponent<T,
         for (T instance : failedInstances) {
             T remaining = storageFallback.insert(instance, false);
             if (!matcher.isEmpty(remaining)) {
-                throw new IllegalStateException("Insertion for a crafting recipe failed" +
+                throw new IllegalStateException(String.format("Insertion for a crafting recipe failed " +
                         "due to inconsistent insertion behaviour by destination in simulation " +
-                        "and non-simulation: " + capabilityTarget + ". Lost: " + instances);
+                        "and non-simulation: %s. Lost: %s", capabilityTarget, instances));
             }
         }