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

CleanroomMC · Jul 11, 2024 · 8b699f1 · 8b699f1
2 parents fa48e29 + 2205255
commit 8b699f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -74,7 +74,7 @@ modGroup = com.cleanroommc.groovyscript
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 1.1.0-hotfix1
+modVersion = 1.1.1
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = false

diff --git a/...a/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/ImmersiveEngineering.java b/...a/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/ImmersiveEngineering.java
@@ -32,12 +32,12 @@ public static IngredientStack toIngredientStack(IIngredient ingredient) {
             return new IngredientStack(IngredientHelper.toItemStack(ingredient).copy());
         }
         if (ingredient instanceof OreDictIngredient) {
-            return new IngredientStack(((OreDictIngredient) ingredient).getOreDict());
+            return new IngredientStack(((OreDictIngredient) ingredient).getOreDict(), ingredient.getAmount());
         }
         if (ingredient instanceof FluidStack) {
             return new IngredientStack(((FluidStack) ingredient).copy());
         }
-        return new IngredientStack(Arrays.asList(ingredient.getMatchingStacks()));
+        return new IngredientStack(Arrays.asList(ingredient.getMatchingStacks()), ingredient.getAmount());
     }
 
     public static boolean areIngredientsEquals(IngredientStack target, IIngredient other) {