aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2016-07-26 19:43:29 +0200
committerDream-Master <dream-master@gmx.net>2016-07-26 19:43:29 +0200
commita1bc16ae700db9a0445e707bc95ed9f21fcb13f9 (patch)
treebd64d8a4e8577606895c8fb4344d2de580a4b5d4 /src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
parenteeab702de4c84effbe22fd0a78b96deae1a31def (diff)
parent7a872dfad2b018869e2790573196a3dfc12cafe9 (diff)
downloadGT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.gz
GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.tar.bz2
GT5-Unofficial-a1bc16ae700db9a0445e707bc95ed9f21fcb13f9.zip
Merge branch 'new-features' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 1470ac733d..9917ca62d7 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1001,7 +1001,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
}
@Override
- public ITexture[] getTexture(byte aSide) {
+ public ITexture[] getTexture(Block aBlock, byte aSide) {
ITexture rIcon = getCoverTexture(aSide);
if (rIcon != null) return new ITexture[]{rIcon};
if (hasValidMetaTileEntity())