aboutsummaryrefslogtreecommitdiff
path: root/src/resources/assets/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/assets/gregtech')
-rw-r--r--src/resources/assets/gregtech/lang/en_US.lang69
-rw-r--r--src/resources/assets/gregtech/lang/zh_CN.lang11
2 files changed, 63 insertions, 17 deletions
diff --git a/src/resources/assets/gregtech/lang/en_US.lang b/src/resources/assets/gregtech/lang/en_US.lang
index caf4f636fb..e2120fdf7b 100644
--- a/src/resources/assets/gregtech/lang/en_US.lang
+++ b/src/resources/assets/gregtech/lang/en_US.lang
@@ -4,15 +4,19 @@
GTPP.EBF.heat=Heat capacity
GTPP.machines.tier=Tier
+GTPP.machines.input=Input
+GTPP.machines.output=Output
GTPP.multiblock.pollutionreduced=Pollution reduced to
GTPP.multiblock.pollution=Pollution
GTPP.multiblock.energy=Stored Energy
-GTPP.multiblock.Progress=Progress
+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.specialvalue=Special Value
+GTPP.multiblock.duration=Duration
@@ -20,18 +24,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 +45,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
+
+
+
+
+
+
+
+
+
@@ -173,7 +212,9 @@ achievement.decay.technetium99.desc=Cyclotron Product
-
+//24/11/19
+achievement.gt.blockmachines.hatch.turbine.input.tier.00=Turbine Housing
+achievement.gt.blockmachines.hatch.turbine.input.tier.00.desc=[AL] Pickup this item to see the recipe in NEI
diff --git a/src/resources/assets/gregtech/lang/zh_CN.lang b/src/resources/assets/gregtech/lang/zh_CN.lang
index 750961610a..6e7d01181c 100644
--- a/src/resources/assets/gregtech/lang/zh_CN.lang
+++ b/src/resources/assets/gregtech/lang/zh_CN.lang
@@ -8,7 +8,7 @@ GTPP.machines.tier=等级
GTPP.multiblock.pollutionreduced=减少污染至
GTPP.multiblock.pollution=污染
GTPP.multiblock.energy=能量存储
-GTPP.multiblock.Progress=进程
+GTPP.multiblock.progress=进程
GTPP.multiblock.efficiency=效率
GTPP.multiblock.problems=为每桶
GTPP.multiblock.mei=最大能量输入
@@ -46,7 +46,12 @@ GTPP.nanohealer.tooltip.4=不会阻止死亡
GTPP.nanohealer.tooltip.5=Shift+右键来切换信息
GTPP.nanohealer.hidden=隐藏信息?
-
+//10/4/19
+//Tooltips for the Mob Killing Baubles
+GTPP.monsterkiller.tooltip.1=在Baubles的护身符栏内使用
+GTPP.monsterkiller.tooltip.2=排泄
+GTPP.monsterkiller.tooltip.3=每击杀
+GTPP.monsterkiller.tooltip.4=目标类型:
@@ -190,4 +195,4 @@ achievement.decay.technetium99.desc=回旋加速器产品
-//This zh_CN.lang is translation by huajijam for GregTech++ (18/2/19) \ No newline at end of file
+//This zh_CN.lang is translated by huajijam for GregTech++ (20/4/19) \ No newline at end of file