From 26650447de34ca5afa38981f973267d5d6794395 Mon Sep 17 00:00:00 2001
From: Cranky Supertoon <crankysupertoon@gmail.com>
Date: Sun, 15 Nov 2020 12:10:12 -0500
Subject: [PATCH 1/2] Finish Crystal Flux Localization

Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>
---
 .../actuallyadditions/mod/inventory/gui/EnergyDisplay.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java
index 97e00004d..534d7a3ad 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java
@@ -20,6 +20,7 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.minecraftforge.fml.client.config.GuiUtils;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -94,6 +95,6 @@ public class EnergyDisplay extends Gui {
 
     private String getOverlayText() {
         NumberFormat format = NumberFormat.getInstance();
-        return String.format("%s/%s Crystal Flux", format.format(this.rfReference.getEnergyStored()), format.format(this.rfReference.getMaxEnergyStored()));
+        return String.format("%s/%s %s", format.format(this.rfReference.getEnergyStored()), format.format(this.rfReference.getMaxEnergyStored()), I18n.format("actuallyadditions.cflong"));
     }
 }

From 1726dac78fa1a9b9e488c06df6726011ae5c419f Mon Sep 17 00:00:00 2001
From: Cranky Supertoon <crankysupertoon@gmail.com>
Date: Sun, 15 Nov 2020 12:12:10 -0500
Subject: [PATCH 2/2] Finish Crystal Flux Localization

Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>
---
 build.gradle                                                   | 2 +-
 .../actuallyadditions/mod/blocks/render/RenderBatteryBox.java  | 3 ++-
 .../ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java   | 3 ++-
 update/changelog.md                                            | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index b62aae997..14a9e6fc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 
-version = "1.12.2-r151"
+version = "1.12.2-r152"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions"
 
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java
index 081dac388..aea1a7760 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderBatteryBox.java
@@ -21,6 +21,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.energy.CapabilityEnergy;
@@ -53,7 +54,7 @@ public class RenderBatteryBox extends TileEntitySpecialRenderer<TileEntityBatter
 
                 String s = format.format(cap.getEnergyStored()) + "/" + format.format(cap.getMaxEnergyStored());
                 float lengthS = -font.getStringWidth(s) / 2F;
-                String s2 = "Crystal Flux";
+                String s2 = I18n.format("actuallyadditions.cflong");
                 float lengthS2 = -font.getStringWidth(s2) / 2F;
 
                 for (int i = 0; i < 4; i++) {
diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java
index 5f7fc9cfd..d81e28ffe 100644
--- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java
+++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java
@@ -18,6 +18,7 @@ import javax.annotation.Nullable;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.tile.CustomEnergyStorage;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
@@ -59,7 +60,7 @@ public abstract class ItemEnergy extends ItemBase {
             IEnergyStorage storage = stack.getCapability(CapabilityEnergy.ENERGY, null);
             if (storage != null) {
                 NumberFormat format = NumberFormat.getInstance();
-                tooltip.add(String.format("%s/%s Crystal Flux", format.format(storage.getEnergyStored()), format.format(storage.getMaxEnergyStored())));
+                tooltip.add(String.format("%s/%s %s", format.format(storage.getEnergyStored()), format.format(storage.getMaxEnergyStored()), I18n.format("actuallyadditions.cflong")));
             }
         }
     }
diff --git a/update/changelog.md b/update/changelog.md
index a73e93e44..6496cd8cc 100644
--- a/update/changelog.md
+++ b/update/changelog.md
@@ -1,3 +1,6 @@
+# 1.12.2-r152
+* CrankySupertoon: Fixed Crystal Flux Localization
+
 # 1.12.2-r151
 * TomyLobo: Improved performance of the item interface.
 * iTitus: Added configs for leaf and coal generators.