aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2016-11-26 11:02:11 +0100
committerTechnus <daniel112092@gmail.com>2016-11-26 11:02:11 +0100
commit389267d73391abdea33c9eae09aa2d3aac51ac7b (patch)
treea78ce8007d7f70749f492ff819881054d426c5bf /src/main/java/gregtech/api/metatileentity/implementations
parent4885dbe0e248846c93cb97c69e381bc96fe8d99d (diff)
downloadGT5-Unofficial-389267d73391abdea33c9eae09aa2d3aac51ac7b.tar.gz
GT5-Unofficial-389267d73391abdea33c9eae09aa2d3aac51ac7b.tar.bz2
GT5-Unofficial-389267d73391abdea33c9eae09aa2d3aac51ac7b.zip
Fix scaling of ItemBlock GT machines in certain scenarios, repostion wire heating info.
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index a6624bdfea..b4c6b3f520 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -322,6 +322,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
public String[] getInfoData() {
return new String[]{
//EnumChatFormatting.BLUE + mName + EnumChatFormatting.RESET,
+ "Heat: "+
+ EnumChatFormatting.RED+ mOverheat +EnumChatFormatting.RESET+" / "+EnumChatFormatting.YELLOW+ mMaxOverheat + EnumChatFormatting.RESET,
"Max Load (1t):",
EnumChatFormatting.GREEN + Integer.toString(mTransferredAmperageOK) + EnumChatFormatting.RESET +" A / "+
EnumChatFormatting.YELLOW + Long.toString(mAmperage) + EnumChatFormatting.RESET +" A",
@@ -331,9 +333,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
"Max Load (20t): "+
EnumChatFormatting.GREEN + Integer.toString(mTransferredAmperageLast20OK) + EnumChatFormatting.RESET +" A",
"Max EU/p (20t): "+
- EnumChatFormatting.GREEN + Long.toString(mTransferredVoltageLast20OK) + EnumChatFormatting.RESET +" EU",
- "Heat: "+
- EnumChatFormatting.RED+ mOverheat +EnumChatFormatting.RESET+" / "+EnumChatFormatting.YELLOW+ mMaxOverheat + EnumChatFormatting.RESET
+ EnumChatFormatting.GREEN + Long.toString(mTransferredVoltageLast20OK) + EnumChatFormatting.RESET +" EU"
};
}
}