diff options
| author | Technus <daniel112092@gmail.com> | 2016-10-04 09:17:13 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-10-04 09:17:13 +0200 |
| commit | 475f8ad676b33b6cda94393af656566db3a23f5f (patch) | |
| tree | 8870ad83d51e9daa941a4e79e32fadffcb06222e /src/main/java/gregtech/api | |
| parent | 784bdb0189ebf731a50a2b08b803c8356883e9f2 (diff) | |
| download | GT5-Unofficial-475f8ad676b33b6cda94393af656566db3a23f5f.tar.gz GT5-Unofficial-475f8ad676b33b6cda94393af656566db3a23f5f.tar.bz2 GT5-Unofficial-475f8ad676b33b6cda94393af656566db3a23f5f.zip | |
Fising WTF
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 14600f2c32..748f2c99c8 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1677,11 +1677,7 @@ public class GT_Utility { rEUAmount += 400; int tValue = 0; if (0 < (tValue = ((IMachineProgress) tTileEntity).getMaxProgress())) -<<<<<<< HEAD - tList.add("Progress: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(((IMachineProgress) tTileEntity).getProgress()) +EnumChatFormatting.RESET+ " / " +EnumChatFormatting.YELLOW+GT_Utility.formatNumbers(tValue) +EnumChatFormatting.RESET); -======= tList.add("Progress: " +EnumChatFormatting.GREEN+GT_Utility.formatNumbers(((IMachineProgress) tTileEntity).getProgress()) +EnumChatFormatting.RESET+ " ticks / " +EnumChatFormatting.YELLOW+GT_Utility.formatNumbers(tValue) +EnumChatFormatting.RESET+" ticks"); ->>>>>>> 00c69b5... Scanner done. } } catch (Throwable e) { if (D1) e.printStackTrace(GT_Log.err); |