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

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

CHANGELOG-1.21.1.md

@@ -1,8 +1,19 @@
 # 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.2"></a>
+## [1.21.1-1.4.2](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.1...1.21.1-1.4.2) - 2026-01-17 14:17:21
+
+
+### Added
+* Add translations through Crowdin (#171)
+
+### Fixed
+* Fix formatting of some exception messages (#173)
+* Fix grammar typo in lang (#172)
+
 <a name="1.21.1-1.4.1"></a>
-## [1.21.1-1.4.1](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.0...1.21.1-1.4.1) - 2026-01-02 10:56:30
+## [1.21.1-1.4.1](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.0...1.21.1-1.4.1) - 2026-01-02 10:56:30 +0100
 
 
 ### Added

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)

resources/changelog/1.21.1-1.4.2.txt

@@ -0,0 +1,9 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.26.2 or higher.
+
+Additions:
+* Add translations through Crowdin (#171)
+
+Fixes:
+* Fix formatting of some exception messages (#173)
+* Fix grammar typo in lang (#172)

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

@@ -152,7 +152,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

@@ -1167,9 +1167,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));
                         }
                     }
                 }
@@ -1611,9 +1611,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));
             }
         }
 

src/main/resources/assets/integratedcrafting/lang/en_us.json

@@ -87,7 +87,7 @@
   "info_book.integratedcrafting.crafting_interface.crafting": "Crafting Process",
   "info_book.integratedcrafting.crafting_interface.crafting.text1": "This section will explain how the crafting process is being handled by &lCrafting Interfaces&r. This information is essential to get the most out of this mod, and to debug any issues you may encounter.",
   "info_book.integratedcrafting.crafting_interface.crafting.text2": "When a crafting job is started (for example with the &lCrafting Writer&r), one (or more) &lCrafting Interface(s)&r will be used that have a recipe corresponding to the given job. All ingredients that are necessary for the recipes will be pulled from the network and held within the crafting jobs in the &lCrafting Interface(s)&r, to avoid ingredients being used elsewhere before the crafting jobs are completed. The &lCrafting Interface&r is responsible for inserting all inputs of the recipe into the bound machine. It will do this based on the storage network contents, as provided by &lIntegrated Tunnels interfaces&r.",
-  "info_book.integratedcrafting.crafting_interface.crafting.text3": "A &lCrafting Interface&r will however &lnot&r import the crafting results from the bound machine. The player is responsible for making sure that the crafting results end up back into the network. The Crafting Table is an exception for this, only a &lCrafting Interface&r is required to craft with this. The &lCrafting Interface&r will track changes in the storage network, and it will only mark the crafting job as completed once the expected outputs are present in the storage network. This can be achieved by either placing an active &lIntegrated Tunnels importer&r onto the machine, or by letting the machine automatically output into the &lCrafting Interface&r. Everything (items, fluids, energy) that is inserted into the &lCrafting Interface&r will be inserted into the storage network for the configured channel.",
+  "info_book.integratedcrafting.crafting_interface.crafting.text3": "A &lCrafting Interface&r will however &lnot&r import the crafting results from the bound machine. The player is responsible for making sure that the crafting results end up back into the network. The Crafting Table is an exception to this, only a &lCrafting Interface&r is required to craft with this. The &lCrafting Interface&r will track changes in the storage network, and it will only mark the crafting job as completed once the expected outputs are present in the storage network. This can be achieved by either placing an active &lIntegrated Tunnels importer&r onto the machine, or by letting the machine automatically output into the &lCrafting Interface&r. Everything (items, fluids, energy) that is inserted into the &lCrafting Interface&r will be inserted into the storage network for the configured channel.",
   "info_book.integratedcrafting.crafting_interface.crafting.text4": "The following figures show examples of valid minimal setups for autocrafting with a Crafting Table and Furnace.",
 
   "info_book.integratedcrafting.crafting_interface.configuration": "Configuration",

src/main/resources/assets/integratedcrafting/lang/nl_nl.json

@@ -62,6 +62,7 @@
   "info_book.integratedcrafting.crafting_interface.basics.text4": "Wanneer je vooruitgang hebt geboekt in het spel, kun je de &lafgestemde vervaardigingsinterface&r maken. Deze vereist niet dat je handmatig recepten eraan toevoegt, omdat het alle recepten zal lezen en verstrekken die beschikbaar zijn in de doelmachine. Dit zijn dezelfde recepten die vermeld staan in de &lmachinelezer&r. Sommige modded machines worden mogelijk niet ondersteund, wat gevisualiseerd wordt met een rode rand tijdens het plaatsen van de &lafgestemde vervaardigingsinterface&r.",
   "info_book.integratedcrafting.crafting_interface.crafting": "Vervaardigingsproces",
   "info_book.integratedcrafting.crafting_interface.crafting.text1": "Deze sectie zal uitleggen hoe het vervaardigingsproces wordt verwerkt door de &lvervaardigingsinterface&r. Deze informatie is essentieel om het meeste uit deze mod te halen en om enige problemen die je kunt tegenkomen te debuggen.",
+  "info_book.integratedcrafting.crafting_interface.crafting.text2": "Wanneer een vervaardigingstaak wordt gestart (bijvoorbeeld met de &lvervaardigingsschrijver&r), zal één of meerdere &lvervaardigingsinterface(s)&r worden gebruikt die een overeenkomstig recept heeft/hebben voor de gegeven taak. Alle ingrediënten die noodzakelijk zijn voor de recepten zullen uit het netwerk worden opgehaald en vastgehouden binnen de vervaardigingstaken in de &lvervaardigingsinterface(s)&r, om te voorkomen dat ingrediënten elders worden verbruikt voordat de vervaardigingstaken voltooien. De &lvervaardigingsinterface&r is verantwoordelijk voor het toevoegen van alle receptingrediënten aan de gekoppelde machine. Dit doet deze gebaseerd op de inhoud van het opslagnetwerk, zoals voorzien door &lIntegrated Tunnels interfaces&r.",
   "info_book.integratedcrafting.crafting_interface.crafting.text4": "De volgende figuren tonen voorbeelden van geldige minimale opstellingen voor automatische vervaardiging met een werkbank en oven.",
   "info_book.integratedcrafting.crafting_interface.configuration": "Configuratie",
   "info_book.integratedcrafting.crafting_interface.configuration.text1": "Zoals bij de meeste &lIntegrated Dynamics&r aanzetstukken, kun je verschillende zaken in de &lvervaardigingsinterface&r instellen zoals kanaal, prioriteit en tickfrequentie.",