Merge branch 'experimental' of https://github.com/Sphyix/GT5-Unofficial into experimental

2 files changed, 13 insertions, 1 deletions

diff --git a/src/main/java/gregtech/api/objects/GT_ItemStack.java b/src/main/java/gregtech/api/objects/GT_ItemStack.java
index 7284854c5f..3e25454fa1 100644
--- a/src/main/java/gregtech/api/objects/GT_ItemStack.java
+++ b/src/main/java/gregtech/api/objects/GT_ItemStack.java
@@ -1,5 +1,6 @@
 package gregtech.api.objects;
 
+import gregtech.api.enums.GT_Values;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
@@ -17,7 +18,11 @@ public class GT_ItemStack {
     }
 
     public GT_ItemStack(ItemStack aStack) {
-        this(aStack == null ? null : aStack.getItem(), aStack == null ? 0 : aStack.stackSize, aStack == null ? 0 : Items.feather.getDamage(aStack));
+        this(aStack, false);
+    }
+
+    public GT_ItemStack(ItemStack aStack, boolean wildcard) {
+        this(aStack == null ? null : aStack.getItem(), aStack == null ? 0 : aStack.stackSize, aStack == null ? 0 : wildcard ? GT_Values.W : Items.feather.getDamage(aStack));
     }
 
     public GT_ItemStack(int aHashCode) {
diff --git a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java
index 1c090eb9b5..0d05e6d229 100644
--- a/src/main/java/gregtech/api/objects/GT_UO_Dimension.java
+++ b/src/main/java/gregtech/api/objects/GT_UO_Dimension.java
@@ -39,4 +39,11 @@ public class GT_UO_Dimension {
 		return null;
 	}
 
+	public String getUOFluidKey(GT_UO_Fluid uoFluid) {
+		return fFluids.inverse().get(uoFluid);
+	}
+
+	public GT_UO_Fluid getUOFluid(String key) {
+		return fFluids.get(key);
+	}
 }