Merge branch 'master' into imgbot

# Conflicts:
#	src/resources/assets/miscutils/textures/items/itemBufferCore.png

151 files changed, 896 insertions, 182 deletions

diff --git a/src/resources/assets/gregtech/lang/zh_CN.lang b/src/resources/assets/gregtech/lang/zh_CN.lang
new file mode 100644
index 0000000000..5ea879e1f3
--- /dev/null
+++ b/src/resources/assets/gregtech/lang/zh_CN.lang
@@ -0,0 +1,21 @@
+
+//Shit I stole from GTNH~
+
+GTPP.EBF.heat=热容
+
+GTPP.machines.tier=等级
+
+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.CC.machinetier=控制核心等级
+GTPP.CC.discount=EU损耗
+GTPP.CC.parallel=最大并行处理进程
+
+//This zh_CN.lang is translation by huajijam for GregTech++ (18/1/19)
\ No newline at end of file
diff --git a/src/resources/assets/miscutils/lang/en_US.lang b/src/resources/assets/miscutils/lang/en_US.lang
index 2dc5fd574e..3276185a7b 100644
--- a/src/resources/assets/miscutils/lang/en_US.lang
+++ b/src/resources/assets/miscutils/lang/en_US.lang
@@ -40,7 +40,7 @@ entity.sickBlaze.name=Infected Zealot
 tile.blockToolBuilder.name=GregTech Tool Constructor
 
 //Tools
-item.itemBufferCore.name=Buffer Core
+item.itemBufferCore.name=Energy Core
 item.itemStaballoyPickaxe.name=Tunnel Digger
 item.itemStaballoyAxe.name=Tree Feller
 item.itemSandstoneHammer.name=Cobblestone Breaker
@@ -1732,16 +1732,16 @@ item.SlowBuildingRing.name=§eSlow Building Ring§7
 item.itemStaballoyPickaxe.name=Tunnel Digger
 item.itemStaballoyAxe.name=Tree Feller
 item.itemSandstoneHammer.name=Cobblestone Breaker
-item.itemBufferCore1.name=Buffer Core [ULV].
-item.itemBufferCore2.name=Buffer Core [LV].
-item.itemBufferCore3.name=Buffer Core [MV].
-item.itemBufferCore4.name=Buffer Core [HV].
-item.itemBufferCore5.name=Buffer Core [EV].
-item.itemBufferCore6.name=Buffer Core [IV].
-item.itemBufferCore7.name=Buffer Core [LuV].
-item.itemBufferCore8.name=Buffer Core [ZPM].
-item.itemBufferCore9.name=Buffer Core [UV].
-item.itemBufferCore10.name=Buffer Core [MAX].
+item.itemBufferCore1.name=Energy Core [ULV].
+item.itemBufferCore2.name=Energy Core [LV].
+item.itemBufferCore3.name=Energy Core [MV].
+item.itemBufferCore4.name=Energy Core [HV].
+item.itemBufferCore5.name=Energy Core [EV].
+item.itemBufferCore6.name=Energy Core [IV].
+item.itemBufferCore7.name=Energy Core [LuV].
+item.itemBufferCore8.name=Energy Core [ZPM].
+item.itemBufferCore9.name=Energy Core [UV].
+item.itemBufferCore10.name=Energy Core [MAX].
 item.itemPLACEHOLDER_Circuit.name=Quark Manipulator (UV)
 item.itembookgt.name=§oThermal Boiler Manual
 
@@ -2699,6 +2699,7 @@ item.particle.base.Lambda.name=Lambda
 item.particle.base.Omega.name=Omega
 item.particle.base.Pion.name=Pion
 item.particle.base.ETA Meson.name=ETA Meson
+item.particle.base.Unknown.name=Unknown Particle
 
 //Added 12/1/19
 
diff --git a/src/resources/assets/miscutils/lang/zh_CN.lang b/src/resources/assets/miscutils/lang/zh_CN.lang
index 99b19979d1..99ee5fca97 100644
--- a/src/resources/assets/miscutils/lang/zh_CN.lang
+++ b/src/resources/assets/miscutils/lang/zh_CN.lang
@@ -1,5 +1,3 @@
-//This zh_CN.lang is translation by huajijam for GregTech++ [2020 Lines]
-
 //Creative Tabs
 itemGroup.MiscUtilBlockTab=[GT++] 方块
 itemGroup.MiscUtilMiscTab=[GT++] 物品
@@ -35,7 +33,7 @@ item.itemFuelRod_Uranium.name=铀燃料棒
 item.itemFuelRod_Plutonium.name=钚燃料棒
 
 //Entities
-entity.constructStaballoy.name=构建稳定合金
+entity.constructStaballoy.name=贫铀合金结构
 entity.sickBlaze.name=被感染的狂热者
 
 //Tile Entities
@@ -158,7 +156,7 @@ item.backpackBlack.name=黑色背包
 item.backpackWhite.name=白色背包
 item.itemBlueprint.name=蓝图 [没什么用]
 item.itemGemShards.name=钻石碎片
-item.itemHalfCompleteCasings.name=半成品机械方块I
+item.itemHalfCompleteCasings.name=半成品机械方块
 item.itemSulfuricPotion.name=喷溅型 硫酸
 item.itemHydrofluoricPotion.name=喷溅型 氢氟酸
 item.itemIngotRaisinBread.name=一份葡萄干面包
@@ -1475,8 +1473,8 @@ item.itemDustZrCl4.name=氯化锆粉
 item.itemDustSmallZrCl4.name=小堆氯化锆粉
 item.itemDustTinyZrCl4.name=小撮氯化锆粉
 item.itemDustCookedZrCl4.name=焙烧过的氯化锆粉
-item.itemDustSmallCookedZrCl4.name=小堆煮过的氯化锆粉
-item.itemDustTinyCookedZrCl4.name=小撮煮过的氯化锆粉
+item.itemDustSmallCookedZrCl4.name=小堆焙烧过的氯化锆粉
+item.itemDustTinyCookedZrCl4.name=小撮焙烧过的氯化锆粉
 item.itemDustUN18Fertiliser.name=流体肥料UN-18粉
 item.itemDustSmallUN18Fertiliser.name=小堆流体肥料UN-18粉
 item.itemDustTinyUN18Fertiliser.name=小撮流体肥料UN-18粉
@@ -1492,164 +1490,165 @@ item.itemDustPlutonium239.name=钚-239粉
 item.itemDustSmallPlutonium239.name=小堆钚-239粉
 item.itemDustTinyPlutonium239.name=小撮钚-239粉
 
+
 //Multitools
-item.AluminiumMultipick.name=铝 Multipick
-item.AluminiumMultispade.name=铝 Multispade
-item.BerylliumMultispade.name=铍 Multispade
-item.BismuthMultispade.name=铋 Multispade
-item.CarbonMultispade.name=碳 Multispade
-item.ChromeMultipick.name=铬 Multipick
-item.ChromeMultispade.name=铬 Multispade
-item.CobaltMultipick.name=钴 Multipick
-item.CobaltMultispade.name=钴 Multispade
-item.GoldMultispade.name=金 Multispade
-item.IridiumMultipick.name=铱 Multipick
-item.IridiumMultispade.name=铱 Multispade
-item.IronMultipick.name=铁 Multipick
-item.IronMultispade.name=铁 Multispade
-item.LeadMultispade.name=铅 Multispade
-item.ManganeseMultipick.name=锰 Multipick
-item.ManganeseMultispade.name=锰 Multispade
-item.MolybdenumMultipick.name=钼 Multipick
-item.MolybdenumMultispade.name=钼 Multispade
-item.NeodymiumMultipick.name=钕 Multipick
-item.NeodymiumMulti