aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java2
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java2
-rw-r--r--src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java2
-rw-r--r--src/main/resources/assets/gregtech/lang/en_US.lang16
-rw-r--r--src/main/resources/assets/tectech/lang/en_US.lang4
6 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java
index 6ba3c48148..6050cdce54 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java
@@ -279,7 +279,7 @@ public class MTEMultiNqGenerator extends MTETooltipMultiBlockBaseEM implements I
@Override
public String[] getInfoData() {
String[] info = super.getInfoData();
- info[4] = "Probably makes: " + EnumChatFormatting.RED
+ info[4] = "Currently generates: " + EnumChatFormatting.RED
+ GTUtility.formatNumbers(Math.abs(this.trueOutput))
+ EnumChatFormatting.RESET
+ " EU/t";
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java
index 5d20427756..666c89aa48 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java
@@ -280,7 +280,7 @@ public class MTEUniversalChemicalFuelEngine extends MTETooltipMultiBlockBaseEM
@Override
public String[] getInfoData() {
String[] info = super.getInfoData();
- info[4] = "Probably makes: " + EnumChatFormatting.RED
+ info[4] = "Currently generates: " + EnumChatFormatting.RED
+ GTUtility.formatNumbers(this.getPowerFlow())
+ EnumChatFormatting.RESET
+ " EU/t";
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
index de0c78d105..722bcf2346 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/MTEBasicMachine.java
@@ -891,7 +891,7 @@ public abstract class MTEBasicMachine extends MTEBasicTank implements RecipeMapW
+ GTUtility.formatNumbers(getBaseMetaTileEntity().getEUCapacity())
+ EnumChatFormatting.RESET
+ " EU",
- "Probably uses: " + EnumChatFormatting.RED
+ "Currently uses: " + EnumChatFormatting.RED
+ GTUtility.formatNumbers(mEUt)
+ EnumChatFormatting.RESET
+ " EU/t at "
diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java
index 6251dcf1e8..e2825f3824 100644
--- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java
+++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java
@@ -419,7 +419,7 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT
+ GTUtility.formatNumbers(maxEnergy)
+ EnumChatFormatting.RESET
+ " EU",
- (getPowerFlow() * eAmpereFlow <= 0 ? "Probably uses: " : "Probably makes: ") + EnumChatFormatting.RED
+ (getPowerFlow() * eAmpereFlow <= 0 ? "Currently uses: " : "Currently generates: ") + EnumChatFormatting.RED
+ GTUtility.formatNumbers(Math.abs(getPowerFlow()))
+ EnumChatFormatting.RESET
+ " EU/t at "
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 049bb66bc4..54d38fed7e 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -657,7 +657,7 @@ GT5U.multiblock.efficiency=Efficiency
GT5U.multiblock.problems=Problems
GT5U.multiblock.mei=Max Energy Income
GT5U.multiblock.maxtier=Max Tier
-GT5U.multiblock.usage=Probably uses
+GT5U.multiblock.usage=Currently uses
GT5U.multiblock.parallelism=Max Parallel
GT5U.multiblock.curparallelism=Current Parallel
GT5U.multiblock.euModifier=EU Modifier
@@ -763,10 +763,10 @@ GT5U.waila.cover.current_facing=Current Facing
GT5U.waila.energy.stored=Stored: §a%s§r EU / §e%s§r EU
GT5U.waila.energy.avg_in_with_amperage=Average Input: §a%s§r EU/t (%sA %s)
GT5U.waila.energy.avg_out_with_amperage=Average Output: §c%s§r EU/t (%sA %s)
-GT5U.waila.energy.use=Probably uses: §e%s§r EU/t (%s)
-GT5U.waila.energy.use_with_amperage=Probably uses: §e%s§r EU/t (%sA %s)
-GT5U.waila.energy.produce=Probably generates: §a%s§r EU/t (%s)
-GT5U.waila.energy.produce_with_amperage=Probably generates: §a%s§r EU/t (%sA %s)
+GT5U.waila.energy.use=Currently uses: §e%s§r EU/t (%s)
+GT5U.waila.energy.use_with_amperage=Currently uses: §e%s§r EU/t (%sA %s)
+GT5U.waila.energy.produce=Currently generates: §a%s§r EU/t (%s)
+GT5U.waila.energy.produce_with_amperage=Currently generates: §a%s§r EU/t (%sA %s)
GT5U.waila.stocking_bus.auto_pull.enabled=Auto-Pull from ME: Enabled
GT5U.waila.stocking_bus.auto_pull.disabled=Auto-Pull from ME: Disabled
GT5U.waila.stocking_bus.min_stack_size=Minimum Stack Size: %s
@@ -1692,8 +1692,8 @@ GTPP.multiblock.progress=Progress
GTPP.multiblock.efficiency=Efficiency
GTPP.multiblock.problems=Problems
GTPP.multiblock.mei=Max Energy Income
-GTPP.multiblock.usage=Probably uses
-GTPP.multiblock.generation=Probably generates
+GTPP.multiblock.usage=Currently uses
+GTPP.multiblock.generation=Currently generates
GTPP.multiblock.specialvalue=Special Value
GTPP.multiblock.duration=Duration
GTPP.multiblock.multimachine.metal=Metal Mode. Does compressor (circuit 20), lathe (circuit 21) and electromagnetic polarizer (circuit 22).
@@ -1701,7 +1701,7 @@ GTPP.multiblock.multimachine.fluid=Fluid Mode. Does fermenter (circuit 20), flui
GTPP.multiblock.multimachine.misc=Misc. Mode. Does precision laser engraver (circuit 20), autoclave (circuit 21) and fluid solidifier (circuit 22).
-GTPP.waila.steam.use=Probably uses: §e%s§r L/s Steam
+GTPP.waila.steam.use=Currently uses: §e%s§r L/s Steam
GTPP.CC.machinetier=Control Core Tier
GTPP.CC.discount=EU Discount
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 6097daa94f..723b47a145 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -1379,8 +1379,8 @@ tt.keyphrase.Contained_mass=Contained mass
tt.keyphrase.Mass_Disposal_speed=Mass Disposal speed
tt.keyphrase.Muffler_BOOM=Muffler BOOM!
tt.keyphrase.Energy_Hatches=Energy Hatches
-tt.keyphrase.Probably_uses=Probably uses
-tt.keyphrase.Probably_makes=Probably makes
+tt.keyphrase.Probably_uses=Currently uses
+tt.keyphrase.Probably_makes=Currently generates
tt.keyphrase.Tier_Rating=Tier Rating
tt.keyphrase.Amp_Rating=Amp Rating
tt.keyphrase.Computation_Available=Computation Available