Merge branch 'experimental' into Ore-Drilling-T5+T6

# Conflicts:
#	src/main/java/gregtech/api/enums/Textures.java

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java b/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
index 12c2e28a37..59059fce8a 100644
--- a/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
+++ b/src/main/java/gregtech/api/objects/GT_CopiedBlockTexture.java
@@ -91,4 +91,12 @@ public class GT_CopiedBlockTexture implements ITexture {
     public boolean isValidTexture() {
         return mBlock != null;
     }
+
+    public Block getBlock() {
+        return mBlock;
+    }
+
+    public byte getMeta() {
+        return mMeta;
+    }
 }
\ No newline at end of file