aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/nei
diff options
context:
space:
mode:
authorJohannes Gäßler <updrn@student.kit.edu>2017-05-12 21:12:01 +0200
committerJohannes Gäßler <updrn@student.kit.edu>2017-05-12 21:12:01 +0200
commit20142f1b10f06c32be1a5835691c1a89c3888a33 (patch)
tree9a715d16426b76bdededd14dfd0244b0c5154385 /src/main/java/gregtech/nei
parent0c2dee56daeb7b94208a581f1dc9f21edbb5e2f6 (diff)
parent60cea028a473537a820e8b48991989cf82546b6f (diff)
downloadGT5-Unofficial-20142f1b10f06c32be1a5835691c1a89c3888a33.tar.gz
GT5-Unofficial-20142f1b10f06c32be1a5835691c1a89c3888a33.tar.bz2
GT5-Unofficial-20142f1b10f06c32be1a5835691c1a89c3888a33.zip
Merge branch 'ChemistryUpdate' into LargeChemicalReactor
Conflicts: src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech/nei')
-rw-r--r--src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index 030a9ad06a..193e8432d1 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -215,7 +215,8 @@ public class GT_NEI_DefaultHandler
}
}
if (tDuration > 0) {
- drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216);
+// drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216);
+ drawText(10, 113, String.format("Time: %.2f secs", 0.05 * tDuration), -16777216);
}
int tSpecial = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;
if (tSpecial == -100 && GT_Mod.gregtechproxy.mLowGravProcessing) {