Merge remote-tracking branch 'origin/master-1.12' into master-1.15

CyclopsMC · May 10, 2020 · 78a011f · 78a011f
2 parents 0920354 + f310c70
commit 78a011f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/resources/changelog/1.12.2-2.4.6.txt b/resources/changelog/1.12.2-2.4.6.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.6.0 or higher.
+
+Fixes:
+* Fix invalid MixedIngredients sometimes being made on empty recipe inputs, Closes CyclopsMC/IntegratedDynamics#825
diff --git a/src/main/java/org/cyclops/commoncapabilities/api b/src/main/java/org/cyclops/commoncapabilities/api
+4 −1		capability/itemhandler/ItemHandlerItemStackIterator.java
+3 −1		ingredient/MixedIngredients.java