From 475f8ad676b33b6cda94393af656566db3a23f5f Mon Sep 17 00:00:00 2001 From: Technus Date: Tue, 4 Oct 2016 09:17:13 +0200 Subject: [PATCH] Fising WTF --- src/main/java/gregtech/api/util/GT_Utility.java | 4 ---- 1 file changed, 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 14600f2c..748f2c99 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);