Merge branch 'GTNewHorizons:master' into master

2 files changed, 461 insertions, 0 deletions

diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
new file mode 100644
index 0000000000..4f6b835f67
--- /dev/null
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -0,0 +1,222 @@
+
+//Shit I stole from GTNH~
+
+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.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
+
+
+
+GTPP.CC.machinetier=Control Core Tier
+GTPP.CC.discount=EU Discount
+GTPP.CC.parallel=Maximum Parallel Processing
+
+//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?
+
+//10/4/19
+//Tooltips for the Mob Killing Baubles
+GTPP.monsterkiller.tooltip.1=Worn as an Amulet within Baubles
+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
+
+
+
+
+
+
+
+
+
+
+
+
+//Achievements
+
+//4/2/19
+achievement.gt.blockmachines.fusioncomputer.tier.09=Fusion Computer Mark IV
+achievement.gtplusplus.blockcasings.3.12=Fusion Casing MK III
+achievement.gtplusplus.blockcasings.3.13=Advanced Magnetic Containment!
+achievement.gtplusplus.blockcasings.3.15=Quantum Containment!
+achievement.gt.blockmachines.fusioncomputer.tier.09.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.gtplusplus.blockcasings.3.12.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.gtplusplus.blockcasings.3.13.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.gtplusplus.blockcasings.3.15.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.gtplusplus.fusion.single=Alternative Fusion
+achievement.gt.blockmachines.gtplusplus.tank.plasma=Plasma Storage
+achievement.gt.blockmachines.gtplusplus.fusion.single.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.gtplusplus.tank.plasma.desc=[AL] Pickup this item to see the recipe in NEI
+
+
+//5/2/19
+achievement.MU-metaitem.01.32106=Junior Physicist
+achievement.MU-metaitem.01.32107=Graduate Physicist
+achievement.MU-metaitem.01.32108=Scholarly Physicist
+achievement.MU-metaitem.01.32109=Master Physicist
+achievement.MU-metaitem.01.32106.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.MU-metaitem.01.32107.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.MU-metaitem.01.32108.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.MU-metaitem.01.32109.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.MU-metaitem.01.32066=Proton Containment
+achievement.MU-metaitem.01.32068=Electron Containment
+achievement.MU-metaitem.01.32070=Quark Containment
+achievement.MU-metaitem.01.32110=Graviton Containment
+achievement.MU-metaitem.01.32066.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.MU-metaitem.01.32068.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.MU-metaitem.01.32070.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.MU-metaitem.01.32110.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.item.personalHealingDevice=Food is for chumps
+achievement.item.personalHealingDevice.desc=[AL] You have upgraded to the nano, the future is yours
+achievement.item.GTPP.BattPack.06.name=Charge Pack Mk I
+achievement.item.GTPP.BattPack.07.name=Charge Pack Mk II
+achievement.item.GTPP.BattPack.08.name=Charge Pack Mk III
+achievement.item.GTPP.BattPack.09.name=Charge Pack Mk IV
+achievement.item.GTPP.BattPack.06.name.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.item.GTPP.BattPack.07.name.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.item.GTPP.BattPack.08.name.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.item.GTPP.BattPack.09.name.desc=[AL] Pickup this item to see the recipe in NEI
+
+
+
+//14/2/19
+achievement.gtpp.start=Gregtech++
+achievement.gtpp.start.desc=So, think you've got what it takes?
+achievement.hatch.control=This is where you put the Control Core
+achievement.hatch.control.desc=A special hatch required by all GT++ Multiblocks.
+achievement.hatch.dynamo.buffered=Buffered Dynamo Hatch
+achievement.hatch.dynamo.buffered.desc=Don't EVER use these on large turbines.
+achievement.multi.abs=Alloy Blast Smelter [ABS]
+achievement.multi.abs.desc=Used to create most late game alloys.
+achievement.dust.potin=Potin!
+achievement.dust.potin.desc=Well, you gotta start somewhere...
+achievement.dust.eglin=Eglin Steel!
+achievement.dust.eglin.desc=Progress, albeit slow...
+achievement.dust.staballoy=Staballoy!
+achievement.dust.staballoy.desc=Now we're talking...
+achievement.dust.quantum=Quantum!
+achievement.dust.quantum.desc=Raw Matter.
+achievement.dust.hypogen=Hypogen!
+achievement.dust.hypogen.desc=What even is this material?
+achievement.block.fishtrap=Free Fish
+achievement.block.fishtrap.desc=Better than HarvestCraft.
+achievement.block.withercage=Jail
+achievement.block.withercage.desc=Trap a Wither/Dragon with this.
+achievement.rtg=Radioisotope Thermoelectric Generation!
+achievement.rtg.desc=Probably stolen from Russia, use with care.
+achievement.dehydrate=Dehydration
+achievement.dehydrate.desc=Drink some water.
+achievement.semifluid=It's like a fluid, but it's not
+achievement.semifluid.desc=Semifluids are confusing.
+achievement.earlywasher=Simple Ore Washer
+achievement.earlywasher.desc=Runs on ULV only.
+achievement.advancedsteam=Alternative Steam options
+achievement.advancedsteam.desc=Smart fuel consumption
+achievement.pollutionremoval=Pollution, no more!
+achievement.pollutionremoval.desc=POLLUTION IS BAD
+achievement.hiampxform=High Amp Transformers
+achievement.hiampxform.desc=Advanced power transformation
+achievement.multi.pss=Power Sub-Station [PSS]
+achievement.multi.pss.desc=Grid Power Storage.
+achievement.multi.cyclo=Cyclotron
+achievement.multi.cyclo.desc=Advanced Science
+achievement.multi.sifter=Industrial Sifter
+achievement.multi.sifter.desc=Faster than a turtle.
+achievement.multi.cokeoven=Industrial Coke Oven [ICO]
+achievement.multi.cokeoven.desc=Better than a Pyrolyse
+achievement.multi.boiler.thermal=Thermal Boiler
+achievement.multi.boiler.thermal.desc=Pahoehoe works too!
+achievement.multi.zhuhai=Zhuhai, Fishing Port
+achievement.multi.zhuhai.desc=Actually exists
+achievement.casing.abs=Slow Progress
+achievement.casing.abs.desc=Eventually, you will have your ABS.
+achievement.casing.cyclotron.coil=Slower Progress
+achievement.casing.cyclotron.coil.desc=Consider why you're even doing this..
+achievement.casing.multiuse=I'm going to make lots of these
+achievement.casing.multiuse.desc=Don't start counting.
+achievement.casing.containment=What's this for?
+achievement.casing.containment.desc=I should probably try find out.
+achievement.decay.neptunium238=Neptunium 238
+achievement.decay.neptunium238.desc=Cyclotron Product
+achievement.decay.radium226=Radium 226
+achievement.decay.radium226.desc=Cyclotron Product
+achievement.decay.molybdenum99=Molybdenum 99
+achievement.decay.molybdenum99.desc=Cyclotron Product
+achievement.decay.technetium99m=Technetium 99M
+achievement.decay.technetium99m.desc=Cyclotron Product
+achievement.decay.technetium99=Technetium 99
+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
+
+//Added 6/12/21
+achievement.gt.blockmachines.gtpp.multimachine.flotationcell=Flotation Cell
+achievement.gt.blockmachines.gtpp.multimachine.flotationcell.desc=[AL] Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.gtpp.multimachine.isamill=IsaMill
+achievement.gt.blockmachines.gtpp.multimachine.isamill.desc=[AL] Pickup this item to see the recipe in NEI
+
diff --git a/src/main/resources/assets/gregtech/lang/zh_CN.lang b/src/main/resources/assets/gregtech/lang/zh_CN.lang
new file mode 100644
index 0000000000..1731d7c3cb
--- /dev/null
+++ b/src/main/resources/assets/gregtech/lang/zh_CN.lang
@@ -0,0 +1,239 @@
+
+//Shit I stole from GTNH~
+
+GTPP.EBF.heat=热容
+
+GTPP.machines.tier=等级
+GTPP.machines.input=输入
+GTPP.machines.output=输出
+
+GTPP.multiblock.pollutionreduced=减少污染至
+GTPP.multiblock.pollution=污染
+GTPP.multiblock.energy=能量存储
+GTPP.multiblock.progress=进程
+GTPP.multiblock.efficiency=效率
+GTPP.multiblock.problems=为每桶
+GTPP.multiblock.mei=最大能量输入
+GTPP.multiblock.usage=大概能用来
+GTPP.multiblock.specialvalue=特殊值
+GTPP.multiblock.duration=持续时间
+
+
+
+GTPP.CC.machinetier=控制核心等级
+GTPP.CC.discount=EU损耗
+GTPP.CC.parallel=最大并行处理进程
+
+//Tooltips for the Charger Packs
+GTPP.battpack.tooltip.1=在Baubles的腰带栏内使用
+GTPP.battpack.tooltip.2=消耗
+GTPP.battpack.tooltip.3=给穿着的盔甲充能
+GTPP.battpack.tooltip.4=同样给快捷栏内的物品充能
+
+//Tooltips for the Personal Healing Bauble
+GTPP.nanohealer.tooltip.1=在Baubles的项链栏内使用
+GTPP.nanohealer.tooltip.2=每次操作消耗1638400EU
+GTPP.nanohealer.tooltip.3=可以恢复血量,饥饿和饱和度
+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=目标类型:
+
+//17/08/19
+GTPP.container.decaychest.name=衰变的
+
+
+
+
+
+
+
+
+
+
+
+
+//NEI INFORMATION
+GTPP.nei.info=信息
+GTPP.nei.eutick=Eu/t
+GTPP.nei.timetaken=耗时
+GTPP.nei.output=输出
+GTPP.nei.input=输入
+GTPP.nei.result=结果
+GTPP.nei.radioation=辐射等级
+
+//Some Generic Words
+GTPP.info.eu=EU
+GTPP.info.euInfo=EU信息
+GTPP.info.inputLimit=输入限制
+GTPP.info.currentPower=当前功率
+GTPP.info.hidden=隐藏
+
+//Some Time Words
+GTPP.time.ticks=刻
+GTPP.time.seconds=秒
+GTPP.time.minutes=分
+GTPP.time.hours=时
+GTPP.time.days=日
+GTPP.time.weeks=周
+GTPP.time.months=月
+
+
+
+
+
+
+
+
+
+
+
+
+//Achievements
+
+//4/2/19
+achievement.gt.blockmachines.fusioncomputer.tier.09=聚变计算机MK IV
+achievement.gtplusplus.blockcasings.3.12=聚变框架MK III
+achievement.gtplusplus.blockcasings.3.13=进阶磁力遏制!
+achievement.gtplusplus.blockcasings.3.15=量子遏制!
+achievement.gt.blockmachines.fusioncomputer.tier.09.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.gtplusplus.blockcasings.3.12.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.gtplusplus.blockcasings.3.13.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.gtplusplus.blockcasings.3.15.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.gt.blockmachines.gtplusplus.fusion.single=可控聚变
+achievement.gt.blockmachines.gtplusplus.tank.plasma=等离子存储
+achievement.gt.blockmachines.gtplusplus.fusion.single.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.gt.blockmachines.gtplusplus.tank.plasma.desc=[AL]捡起这个物品以在NEI内查看配方
+
+
+//5/2/19
+achievement.MU-metaitem.01.32106=初级物理学家
+achievement.MU-metaitem.01.32107=研究生物理学家
+achievement.MU-metaitem.01.32108=学术物理学家
+achievement.MU-metaitem.01.32109=物理学硕士
+achievement.MU-metaitem.01.32106.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.MU-metaitem.01.32107.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.MU-metaitem.01.32108.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.MU-metaitem.01.32109.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.MU-metaitem.01.32066=质子遏制
+achievement.MU-metaitem.01.32068=电子遏制
+achievement.MU-metaitem.01.32070=夸克遏制
+achievement.MU-metaitem.01.32110=引力遏制
+achievement.MU-metaitem.01.32066.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.MU-metaitem.01.32068.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.MU-metaitem.01.32070.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.MU-metaitem.01.32110.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.item.personalHealingDevice=食物是为了笨蛋
+achievement.item.personalHealingDevice.desc=[AL]你已经升级到纳米，未来就是你的
+achievement.item.GTPP.BattPack.06.name=充电工具包Mk I
+achievement.item.GTPP.BattPack.07.name=充电工具包Mk II
+achievement.item.GTPP.BattPack.08.name=充电工具包Mk III
+achievement.item.GTPP.BattPack.09.name=充电工具包Mk IV
+achievement.item.GTPP.BattPack.06.name.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.item.GTPP.BattPack.07.name.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.item.GTPP.BattPack.08.name.desc=[AL]捡起这个物品以在NEI内查看配方
+achievement.item.GTPP.BattPack.09.name.desc=[AL]捡起这个物品以在NEI内查看配方
+
+
+
+//14/2/19
+achievement.gtpp.start=Gregtech++
+achievement.gtpp.start.desc=所以,你认为你已经得到了它?
+achievement.hatch.control=这是你放置控制核心的地方
+achievement.hatch.control.desc=所有GT++的多方块都需要特殊的填充.
+achievement.hatch.dynamo.buffered=缓冲后的发电机填充物
+achievement.hatch.dynamo.buffered.desc=不要在大型涡轮机上使用这些.
+achievement.multi.abs=合金冶炼炉[ABS]
+achievement.multi.abs.desc=用于制造大多数后期合金.
+achievement.dust.potin=粗青铜合金!
+achievement.dust.potin.desc=好吧,你得从某个地方开始...
+achievement.dust.eglin=埃格林钢铁!
+achievement.dust.eglin.desc=进展虽然缓慢...
+achievement.dust.staballoy=贫铀合金!
+achievement.dust.staballoy.desc=现在我们正在讨论...
+achievement.dust.quantum=量子!
+achievement.dust.quantum.desc=原料.
+achievement.dust.hypogen=海珀珍!
+achievement.dust.hypogen.desc=这甚至是什么材料?
+achievement.block.fishtrap=免费的鱼
+achievement.block.fishtrap.desc=比潘马斯农场好.
+achievement.block.withercage=监狱
+achievement.block.withercage.desc=用此捕捉凋零/末影龙.
+achievement.rtg=放射性同位素热电发电!
+achievement.rtg.desc=可能盗于俄罗斯,小心使用.
+achievement.dehydrate=脱水
+achievement.dehydrate.desc=喝些水.
+achievement.semifluid=它像是液体,但它不是
+achievement.semifluid.desc=半流体令人困惑.
+achievement.earlywasher=简单的洗矿场
+achievement.earlywasher.desc=只在ULV下工作.
+achievement.advancedsteam=替代蒸汽选项
+achievement.advancedsteam.desc=智能油耗
+achievement.pollutionremoval=污染,没了!
+achievement.pollutionremoval.desc=污染不好
+achievement.hiampxform=高放大变压器
+achievement.hiampxform.desc=进阶电力转换
+achievement.multi.pss=能源站[PSS]
+achievement.multi.pss.desc=电力网络存储.
+achievement.multi.cyclo=回旋加速器
+achievement.multi.cyclo.desc=高级科学
+achievement.multi.sifter=工业筛选机
+achievement.multi.sifter.desc=比乌龟快.
+achievement.multi.cokeoven=工业焦炉[ICO]
+achievement.multi.cokeoven.desc=比热解炉更好
+achievement.multi.boiler.thermal=地热锅炉
+achievement.multi.boiler.thermal.desc=熔岩也有效!
+achievement.multi.zhuhai=珠海,渔场
+achievement.multi.zhuhai.desc=实际存在
+achievement.casing.abs=进展缓慢
+achievement.casing.abs.desc=最终,你将拥有你的合金冶炼炉.
+achievement.casing.cyclotron.coil=进展缓慢
+achievement.casing.cyclotron.coil.desc=考虑为什么你甚至这样做..
+achievement.casing.multiuse=我要做很多这些
+achievement.casing.multiuse.desc=不要开始计数.
+achievement.casing.containment=这个是干什么的?
+achievement.casing.containment.desc=我应该试着找出来.
+achievement.decay.neptunium238=镎238
+achievement.decay.neptunium238.desc=回旋加速器产品
+achievement.decay.radium226=镭226
+achievement.decay.radium226.desc=回旋加速器产品
+achievement.decay.molybdenum99=钼99
+achievement.decay.molybdenum99.desc=回旋加速器产品
+achievement.decay.technetium99m=锝99M
+achievement.decay.technetium99m.desc=回旋加速器产品
+achievement.decay.technetium99=锝99
+achievement.decay.technetium99.desc=回旋加速器产品
+
+
+
+//24/11/19
+achievement.gt.blockmachines.hatch.turbine.input.tier.00=涡轮框架
+achievement.gt.blockmachines.hatch.turbine.input.tier.00.desc=[AL]捡起这个物品以在NEI内查看配方
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//This zh_CN.lang is translated by huajijam for GregTech++ (3/1/20)
\ No newline at end of file