Merge branch '1.19.4' into 1.19.3

CHANGELOG.md

@@ -1,11 +1,3 @@
-### Additions
-* Dev mode now displays warnings and errors on recipes with resolution instructions
-
-### Tweaks
-* Adjusted input capturing behavior for non-primary mouse buttons #598
-* Updated JEI integration for 1.21 and 1.20.6 #607 #577
-
 ### Fixes
-* Fixed Fabric networking not working correctly #586 #584
-* Fixed dynamic registry availability for stack serialization #532 
-* Fixed certain recipe ingredients having incorrect amounts starting in 1.1.8 #597
+* Fixed certain recipe ingredients having incorrect amounts starting in 1.1.8 properly #609 #610
+* Fixed registry adapters for dynamic registries in older versions #527

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.19.3
 enabled_platforms=fabric,forge
 
 archives_base_name=emi
-mod_version=1.1.9
+mod_version=1.1.10
 maven_group=dev.emi
 
 architectury_version=4.9.83

xplat/src/main/java/dev/emi/emi/api/stack/EmiIngredient.java

@@ -108,7 +108,12 @@ public static EmiIngredient of(List<? extends EmiIngredient> list, long amount)
 		if (list.size() == 0) {
 			return EmiStack.EMPTY;
 		} else if (list.size() == 1) {
-			return list.get(0).copy().setAmount(amount);
+			EmiIngredient stack = list.get(0);
+			if (stack.getAmount() < amount) {
+				return stack.copy().setAmount(amount);
+			} else {
+				return stack;
+			}
 		} else {
 			long internalAmount = list.get(0).getAmount();
 			for (EmiIngredient i : list) {