From 9f32217b9725a29034b8fb91195b5930117068a1 Mon Sep 17 00:00:00 2001 From: brachy84 Date: Sat, 6 Jul 2024 16:14:05 +0000 Subject: [PATCH 1/2] Bump version to 1.1.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b70226098..78517c5db 100644 --- 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 From 22052559b7394123c59a56b1eb087583b1fd2400 Mon Sep 17 00:00:00 2001 From: Waiting Idly <25394029+WaitingIdly@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:29:11 -0700 Subject: [PATCH 2/2] resolve #190 (#191) --- .../mods/immersiveengineering/ImmersiveEngineering.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/ImmersiveEngineering.java b/src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/ImmersiveEngineering.java index 1982b124e..527d235db 100644 --- a/src/main/java/com/cleanroommc/groovyscript/compat/mods/immersiveengineering/ImmersiveEngineering.java +++ b/src/main/java/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) {