Merge remote-tracking branch 'origin/experimental' into unify-build-script

# Conflicts:
#	.gitignore
#	build.gradle
#	build.properties

1 files changed, 7 insertions, 0 deletions

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);
+	}
 }