From 828d9f0f8256f39d976f5ce6aedd6cb3b9cf560e Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Sat, 17 Aug 2019 19:11:38 +0100
Subject: + Added Air consumption to the LRE. % Made the LRE longer. (10, up
 from 4) % Greatly improved NEI handling for decayables. $ Improved logic of
 LRE. $ Fixed NEI crash. $ Fixed bug in underlying GT code causing
 depleteInput to return false wrongly.

---
 src/resources/assets/gregtech/lang/en_US.lang      |  59 ++++++++++++++++-----
 src/resources/assets/miscutils/lang/en_US.lang     |   3 +-
 .../miscutils/textures/gui/nei/decayables.png      | Bin 0 -> 2623 bytes
 .../assets/miscutils/textures/gui/nei/widgets.png  | Bin 0 -> 1876 bytes
 4 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 src/resources/assets/miscutils/textures/gui/nei/decayables.png
 create mode 100644 src/resources/assets/miscutils/textures/gui/nei/widgets.png

(limited to 'src/resources')

diff --git a/src/resources/assets/gregtech/lang/en_US.lang b/src/resources/assets/gregtech/lang/en_US.lang
index caf4f636fb..c388f9785e 100644
--- a/src/resources/assets/gregtech/lang/en_US.lang
+++ b/src/resources/assets/gregtech/lang/en_US.lang
@@ -20,18 +20,6 @@ GTPP.CC.machinetier=Control Core Tier
 GTPP.CC.discount=EU Discount
 GTPP.CC.parallel=Maximum Parallel Processing
 
-
-
-//Some Generic Words
-GTPP.info.eu=EU
-GTPP.info.euInfo=EU Information
-GTPP.info.inputLimit=Input Limit
-GTPP.info.currentPower=Current Power
-GTPP.info.hidden=Hidden
-
-
-
-
 //Tooltips for the Charger Packs
 GTPP.battpack.tooltip.1=Worn as a Belt within Baubles
 GTPP.battpack.tooltip.2=Drains
@@ -53,6 +41,53 @@ GTPP.monsterkiller.tooltip.2=Drains
 GTPP.monsterkiller.tooltip.3=per each kill
 GTPP.monsterkiller.tooltip.4=Target Type:
 
+//17/08/19
+GTPP.container.decaychest.name=Decayables
+
+
+
+
+
+
+
+
+
+
+
+
+//NEI INFORMATION
+GTPP.nei.info=Information
+GTPP.nei.eutick=Eu/t
+GTPP.nei.timetaken=Time Taken
+GTPP.nei.output=Output
+GTPP.nei.input=Input
+GTPP.nei.result=Result
+GTPP.nei.radioation=Radiation Level
+
+//Some Generic Words
+GTPP.info.eu=EU
+GTPP.info.euInfo=EU Information
+GTPP.info.inputLimit=Input Limit
+GTPP.info.currentPower=Current Power
+GTPP.info.hidden=Hidden
+
+//Some Time Words
+GTPP.time.ticks=Ticks
+GTPP.time.seconds=Seconds
+GTPP.time.minutes=Minutes
+GTPP.time.hours=Hours
+GTPP.time.days=Days
+GTPP.time.weeks=Weeks
+GTPP.time.months=Months
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 3aefd6dee2..bc4b170654 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -2968,4 +2968,5 @@ item.itemCellHydrogenCyanide.name=Cell of Hydrogen Cyanide
 item.itemCactusCharcoal.name=Cactus Charcoal
 item.itemCactusCoke.name=Cactus Coke
 item.itemSugarCharcoal.name=Sugar Charcoal
-item.itemSugarCoke.name=Sugar Coke
\ No newline at end of file
+item.itemSugarCoke.name=Sugar Coke
+item.LiquidHydrogen.name=Liquid Hydrogen Cell [LOH]
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/textures/gui/nei/decayables.png b/src/resources/assets/miscutils/textures/gui/nei/decayables.png
new file mode 100644
index 0000000000..d1827433a0
Binary files /dev/null and b/src/resources/assets/miscutils/textures/gui/nei/decayables.png differ
diff --git a/src/resources/assets/miscutils/textures/gui/nei/widgets.png b/src/resources/assets/miscutils/textures/gui/nei/widgets.png
new file mode 100644
index 0000000000..0dc26c43e4
Binary files /dev/null and b/src/resources/assets/miscutils/textures/gui/nei/widgets.png differ
-- 
cgit