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

Author: rubensworks

CHANGELOG-1.19.2.md

@@ -1,8 +1,15 @@
 # Changelog for Minecraft 1.19.2
 All notable changes to this project will be documented in this file.
 
+<a name="1.19.2-1.6.17"></a>
+## [1.19.2-1.6.17](/compare/1.19.2-1.6.16...1.19.2-1.6.17) - 2026-03-10 14:22:24
+
+
+### Fixed
+* Fix flat plans not showing dependencies anymore
+
 <a name="1.19.2-1.6.16"></a>
-## [1.19.2-1.6.16](/compare/1.19.2-1.6.15...1.19.2-1.6.16) - 2026-02-17 11:41:13
+## [1.19.2-1.6.16](/compare/1.19.2-1.6.15...1.19.2-1.6.16) - 2026-02-17 11:41:13 +0100
 
 
 ### Added

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.6.20"></a>
+## [1.20.1-1.6.20](/compare/1.20.1-1.6.19...1.20.1-1.6.20) - 2026-03-10 14:23:33
+
+
+### Fixed
+* Fix flat plans not showing dependencies anymore
+
 <a name="1.20.1-1.6.19"></a>
-## [1.20.1-1.6.19](/compare/1.20.1-1.6.18...1.20.1-1.6.19) - 2026-03-08 07:41:08
+## [1.20.1-1.6.19](/compare/1.20.1-1.6.18...1.20.1-1.6.19) - 2026-03-08 07:41:08 +0100
 
 
 ### Fixed

resources/changelog/1.19.2-1.6.17.txt

@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Fixes:
+* Fix flat plans not showing dependencies anymore
+

resources/changelog/1.20.1-1.6.20.txt

@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Fixes:
+* Fix flat plans not showing dependencies anymore

src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/TerminalCraftingPlanStatic.java

@@ -244,7 +244,7 @@ public Collection<TerminalCraftingPlanFlatStatic.Entry> getEntries() {
 
     protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEntries, Set<I> handledPlans, ITerminalCraftingPlan<I> plan) {
         // Since jobs can have multiple dependents due to job splitting, we only consider each job once during flattening.
-        if (handledPlans.contains(plan.getId())) {
+        if ((!(plan.getId() instanceof Integer id) || id > 0) && handledPlans.contains(plan.getId())) {
             return;
         }
         handledPlans.add(plan.getId());