aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java1
-rw-r--r--src/main/java/gregtech/common/power/Power.java6
2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 9420a106ea..8491ea328c 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -153,6 +153,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public boolean mIncreaseDungeonLoot = true;
public boolean mAxeWhenAdventure = true;
public boolean mSurvivalIntoAdventure = false;
+ public boolean mNEIRecipeSecondMode = true;
public boolean mNerfedWoodPlank = true;
public boolean mNerfedVanillaTools = true;
public boolean mHardRock = false;
diff --git a/src/main/java/gregtech/common/power/Power.java b/src/main/java/gregtech/common/power/Power.java
index e0526c14aa..eac33e7997 100644
--- a/src/main/java/gregtech/common/power/Power.java
+++ b/src/main/java/gregtech/common/power/Power.java
@@ -34,10 +34,14 @@ public abstract class Power {
return 0.05d * getDurationTicks();
}
- public String getDurationString() {
+ public String getDurationStringSeconds() {
return GT_Utility.formatNumbers(getDurationSeconds()) + GT_Utility.trans("161", " secs");
}
+ public String getDurationStringTicks() {
+ return GT_Utility.formatNumbers(getDurationTicks()) + GT_Utility.trans("224", " ticks");
+ }
+
public abstract String getTotalPowerString();
public abstract String getPowerUsageString();