aboutsummaryrefslogtreecommitdiff
path: root/src/resources/assets
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/assets')
-rw-r--r--src/resources/assets/gregtech/lang/en_US.lang61
-rw-r--r--src/resources/assets/miscutils/lang/en_US.lang7
-rw-r--r--src/resources/assets/miscutils/textures/gui/SlowFusion.pngbin0 -> 2182 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/6.pngbin0 -> 1338 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/7.pngbin0 -> 1317 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/8.pngbin0 -> 1402 bytes
-rw-r--r--src/resources/assets/miscutils/textures/items/chargepack/9.pngbin0 -> 1183 bytes
7 files changed, 68 insertions, 0 deletions
diff --git a/src/resources/assets/gregtech/lang/en_US.lang b/src/resources/assets/gregtech/lang/en_US.lang
index a3378d004c..9e954f5500 100644
--- a/src/resources/assets/gregtech/lang/en_US.lang
+++ b/src/resources/assets/gregtech/lang/en_US.lang
@@ -14,6 +14,67 @@ GTPP.multiblock.problems=Problems
GTPP.multiblock.mei=Max Energy Income
GTPP.multiblock.usage=Probably uses
+
+
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
+
+
+
+
+
+
+
+
+//Achievements
+achievement.gt.blockmachines.fusioncomputer.tier.09=Fusion Computer Mark IV
+achievement.gt.blockmachines.fusioncomputer.tier.09.desc=Pickup this item to see the recipe in NEI
+
+achievement.gtplusplus.blockcasings.3.12=Fusion Casing MK III
+achievement.gtplusplus.blockcasings.3.12.desc=Pickup this item to see the recipe in NEI
+
+achievement.gtplusplus.blockcasings.3.13=Advanced Magnetic Containment!
+achievement.gtplusplus.blockcasings.3.13.desc=Pickup this item to see the recipe in NEI
+
+achievement.gtplusplus.blockcasings.3.15=Quantum Containment!
+achievement.gtplusplus.blockcasings.3.15.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.blockmachines.gtplusplus.fusion.single=Alternative Fusion
+achievement.gt.blockmachines.gtplusplus.fusion.single.desc=Pickup this item to see the recipe in NEI
+
+achievement.gt.blockmachines.gtplusplus.tank.plasma=Plasma Storage
+achievement.gt.blockmachines.gtplusplus.tank.plasma.desc=Pickup this item to see the recipe in NEI
+
+
+
+
+
+
+
+
+
+//Tooltips for the Charger Packs
+GTPP.battpack.tooltip.1=Worn as a Belt within Baubles
+GTPP.battpack.tooltip.2=Drains
+GTPP.battpack.tooltip.3=to charge worn armour
+GTPP.battpack.tooltip.4=Also charges items on the hotbar
+
+
+
+//Tooltips for the Personal Healing Bauble
+GTPP.nanohealer.tooltip.1=Worn as a Necklace within Baubles
+GTPP.nanohealer.tooltip.2=Drains 1638400EU per operation
+GTPP.nanohealer.tooltip.3=Can restore HP, Hunger and Saturation
+GTPP.nanohealer.tooltip.4=WILL NOT PREVENT DEATH
+GTPP.nanohealer.tooltip.5=Shift+RMB to toggle notifications
+GTPP.nanohealer.hidden=Hiding Info?
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 3276185a7b..723f3b6826 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -2709,3 +2709,10 @@ tile.playerDoorIce.name=Ice Auto-Door
tile.playerDoorIron.name=Iron Auto-Door
tile.playerDoorWood.name=Wooden Auto-Door
+/Added 4/2/19
+
+item.GTPP.BattPack.06.name=Charge Pack [LuV]
+item.GTPP.BattPack.07.name=Charge Pack [ZPM]
+item.GTPP.BattPack.08.name=Charge Pack [UV]
+item.GTPP.BattPack.09.name=Charge Pack [MAX]
+
diff --git a/src/resources/assets/miscutils/textures/gui/SlowFusion.png b/src/resources/assets/miscutils/textures/gui/SlowFusion.png
new file mode 100644
index 0000000000..76c6c91ad1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/SlowFusion.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/6.png b/src/resources/assets/miscutils/textures/items/chargepack/6.png
new file mode 100644
index 0000000000..a01f435e72
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/6.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/7.png b/src/resources/assets/miscutils/textures/items/chargepack/7.png
new file mode 100644
index 0000000000..fb5a5fba43
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/7.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/8.png b/src/resources/assets/miscutils/textures/items/chargepack/8.png
new file mode 100644
index 0000000000..aff1ec693f
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/8.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/9.png b/src/resources/assets/miscutils/textures/items/chargepack/9.png
new file mode 100644
index 0000000000..0b9cf4d18e
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/9.png
Binary files differ