Update to GT 6.10.21 and QwerTech-1.0.0-a.49

README.md

@@ -6,9 +6,9 @@
 
 GregTech6 汉化项目，欢迎加入。
 
-当前适配版本为 v6.10.06，内置兼容 QwerTech-1.0.0-a.48
+当前适配版本为 v6.10.21，内置兼容 QwerTech-1.0.0-a.49
 
-Currently updated to GT 6.10.06, with built-in support for QwerTech-1.0.0-a.48
+Currently updated to GT 6.10.21, with built-in support for QwerTech-1.0.0-a.49
 
 [Weblate 翻译服务器传送门](https://weblate.exz.me/projects/gregtech/)
 

config/glossary.yml

@@ -2172,6 +2172,10 @@ material:
   White Meranti: 白娑罗双
   Compressed: 压缩木
   Dry: 干
+  Disulfuric Acid: 焦硫酸
+  Riverwater: 河水
+  Lanthanum: 镧
+
 
 
 

config/patterns.yml

@@ -1,4 +1,9 @@
 # uncatagorized
+- key: S:oredict.crateGt.+
+  priority: 5000
+  repl: "{material}板条箱"
+  token: item
+  value: Partial Crate of (?P<material>.+)
 - key: S:oredict.crateGt.+
   priority: 5000
   repl: "{material}板条箱"
@@ -658,6 +663,31 @@
   repl: "蒸汽裂解器 ({material})"
   token: item
   value: Steam Cracker \((?P<material>.+)\)
+- key: S:gt.multitileentity.+
+  priority: 1000
+  repl: "小型{material}储罐主阀门"
+  token: item
+  value: Small (?P<material>.+) Tank Main Valve
+- key: S:gt.multitileentity.+
+  priority: 1000
+  repl: "大型{material}储罐主阀门"
+  token: item
+  value: Large (?P<material>.+) Tank Main Valve
+- key: S:gt.multitileentity.+
+  priority: 1000
+  repl: "小型致密{material}储罐主阀门"
+  token: item
+  value: Small Dense (?P<material>.+) Tank Main Valve
+- key: S:gt.multitileentity.+
+  priority: 1000
+  repl: "大型致密{material}储罐主阀门"
+  token: item
+  value: Large Dense (?P<material>.+) Tank Main Valve
+- key: S:gt.multitileentity.+
+  priority: 1000
+  repl: "{material}锅炉气压计核心"
+  token: item
+  value: (?P<material>.+) Boiler Main Barometer
 
 # bumblebee
 - key: S:gt.multiitem.bumblebee.+

lang/fluid/en_us.lang

@@ -226,6 +226,8 @@ S:fluid.deuterium=Deuterium
 S:fluid.deuterium.name=Deuterium
 S:fluid.diesel=Diesel
 S:fluid.diesel.name=Diesel
+S:fluid.disulfuricacid=Disulfuric Acid
+S:fluid.disulfuricacid.name=Disulfuric Acid
 S:fluid.dna=DNA
 S:fluid.dna.name=DNA
 S:fluid.dragonbreath=Dragon's Breath
@@ -750,6 +752,8 @@ S:fluid.molten.tungsten=Molten Tungsten
 S:fluid.molten.tungsten.name=Molten Tungsten
 S:fluid.molten.tungstensteel=Molten Tungstensteel
 S:fluid.molten.tungstensteel.name=Molten Tungstensteel
+S:fluid.molten.tungstentrioxide=Molten Tungsten Trioxide
+S:fluid.molten.tungstentrioxide.name=Molten Tungsten Trioxide
 S:fluid.molten.ultimet=Molten Ultimet
 S:fluid.molten.ultimet.name=Molten Ultimet
 S:fluid.molten.vanadium=Molten Vanadium
@@ -1104,6 +1108,8 @@ S:fluid.ricevinegar=Rice Vinegar
 S:fluid.ricevinegar.name=Rice Vinegar
 S:fluid.ricewater=Ricewater
 S:fluid.ricewater.name=Ricewater
+S:fluid.riverwater=Riverwater
+S:fluid.riverwater.name=Riverwater
 S:fluid.rottendrink=Rotten Drink
 S:fluid.rottendrink.name=Rotten Drink
 S:fluid.salsa=Medium Salsa

lang/fluid/zh_cn.lang

@@ -226,6 +226,8 @@ S:fluid.deuterium=氘
 S:fluid.deuterium.name=氘
 S:fluid.diesel=柴油
 S:fluid.diesel.name=柴油
+S:fluid.disulfuricacid=焦硫酸
+S:fluid.disulfuricacid.name=焦硫酸
 S:fluid.dna=DNA
 S:fluid.dna.name=DNA
 S:fluid.dragonbreath=龙息
@@ -754,6 +756,8 @@ S:fluid.molten.tungsten=熔融钨
 S:fluid.molten.tungsten.name=熔融钨
 S:fluid.molten.tungstensteel=熔融钨钢
 S:fluid.molten.tungstensteel.name=熔融钨钢
+S:fluid.molten.tungstentrioxide=熔融三氧化钨
+S:fluid.molten.tungstentrioxide.name=熔融三氧化钨
 S:fluid.molten.ultimet=熔融哈氏合金
 S:fluid.molten.ultimet.name=熔融哈氏合金
 S:fluid.molten.vanadium=熔融钒
@@ -1108,6 +1112,8 @@ S:fluid.ricevinegar=米醋
 S:fluid.ricevinegar.name=米醋
 S:fluid.ricewater=米汤
 S:fluid.ricewater.name=米汤
+S:fluid.riverwater=河水
+S:fluid.riverwater.name=河水
 S:fluid.rottendrink=过期饮料
 S:fluid.rottendrink.name=过期饮料
 S:fluid.salsa=中辣萨尔萨酱

lang/gt_drink/en_us.lang

@@ -308,6 +308,7 @@ S:gt.drink.reedwater=I guess this tastes better when fermented
 S:gt.drink.ricardosanchez=Wubalubadubdub
 S:gt.drink.ricevinegar=
 S:gt.drink.ricewater=
+S:gt.drink.riverwater=Fresh Riverwater
 S:gt.drink.rottendrink=Smells rotten
 S:gt.drink.salsa=With a little kick
 S:gt.drink.saltwater=Saltier than the seven Seas

lang/gt_drink/zh_cn.lang

@@ -308,6 +308,7 @@ S:gt.drink.reedwater=我猜这玩意发酵过后肯定好喝
 S:gt.drink.ricardosanchez=呜吧噜吧嘟吧噜吧嘟吧
 S:gt.drink.ricevinegar=
 S:gt.drink.ricewater=
+S:gt.drink.riverwater=清澈的河水
 S:gt.drink.rottendrink=腐烂风味
 S:gt.drink.salsa=With a little kick
 S:gt.drink.saltwater=比海水咸7倍！

lang/gt_material/en_us.lang

@@ -843,6 +843,7 @@ S:gt.material.Diesel=Diesel
 S:gt.material.Dilithium=Dilithium
 S:gt.material.Dioptase=Dioptase
 S:gt.material.Diorite=Diorite
+S:gt.material.DisulfuricAcid=Disulfuric Acid
 S:gt.material.Dolamide=Dolamide
 S:gt.material.Dolomite=Dolomite
 S:gt.material.DominicanAmber=DominicanAmber
@@ -1086,6 +1087,7 @@ S:gt.material.Kreknorite=Kreknorite
 S:gt.material.Krypton=Krypton
 S:gt.material.Kyanite=Kyanite
 S:gt.material.Lantanum=Lantanum
+S:gt.material.Lanthanum=Lanthanum
 S:gt.material.Lapis=Lapis
 S:gt.material.Latex=Latex
 S:gt.material.Lava=Lava

lang/gt_material/zh_cn.lang

@@ -843,6 +843,7 @@ S:gt.material.Diesel=柴油
 S:gt.material.Dilithium=双锂
 S:gt.material.Dioptase=翠铜石
 S:gt.material.Diorite=闪长岩
+S:gt.material.DisulfuricAcid=焦硫酸
 S:gt.material.Dolamide=酰胺
 S:gt.material.Dolomite=白云岩
 S:gt.material.DominicanAmber=多米尼加蓝琥珀
@@ -1087,6 +1088,7 @@ S:gt.material.Krypton=氪
 S:gt.material.Kyanite=蓝晶石
 S:gt.material.Lantanium=镧
 S:gt.material.Lantanum=镧
+S:gt.material.Lanthanum=镧
 S:gt.material.Lapis=青金石
 S:gt.material.Latex=胶乳
 S:gt.material.Lava=岩浆

lang/gt_misc/en_us.lang

@@ -3,6 +3,30 @@ S:gt.advcrafting.drop.slot=Automation can extract Items you drop into this Slot
 S:gt.advcrafting.insert.blueprint=Insert a Blueprint here
 S:gt.advcrafting.neutral.slot=This Slot does ABSOLUTELY NOTHING to its content
 S:gt.advcrafting.put.to.storage=Move Crafting Grid content to Storage Slots
+S:gt.armor.hazmat.biochemgas.boots.name=Biochemical Gas Hazard Suit Boots
+S:gt.armor.hazmat.biochemgas.chest.name=Biochemical Gas Hazard Suit Shirt
+S:gt.armor.hazmat.biochemgas.head.name=Biochemical Gas Hazard Suit Mask
+S:gt.armor.hazmat.biochemgas.legs.name=Biochemical Gas Hazard Suit Pants
+S:gt.armor.hazmat.frost.boots.name=Frost Protection Suit Boots
+S:gt.armor.hazmat.frost.chest.name=Frost Protection Suit Shirt
+S:gt.armor.hazmat.frost.head.name=Frost Protection Suit Mask
+S:gt.armor.hazmat.frost.legs.name=Frost Protection Suit Pants
+S:gt.armor.hazmat.heat.boots.name=Heat Protection Suit Boots
+S:gt.armor.hazmat.heat.chest.name=Heat Protection Suit Shirt
+S:gt.armor.hazmat.heat.head.name=Heat Protection Suit Mask
+S:gt.armor.hazmat.heat.legs.name=Heat Protection Suit Pants
+S:gt.armor.hazmat.insect.boots.name=Bumbleboots
+S:gt.armor.hazmat.insect.chest.name=Bumbleshirt
+S:gt.armor.hazmat.insect.head.name=Bumblehead
+S:gt.armor.hazmat.insect.legs.name=Bumblepants
+S:gt.armor.hazmat.radiation.boots.name=Radiation Hazard Suit Boots
+S:gt.armor.hazmat.radiation.chest.name=Radiation Hazard Suit Shirt
+S:gt.armor.hazmat.radiation.head.name=Radiation Hazard Suit Mask
+S:gt.armor.hazmat.radiation.legs.name=Radiation Hazard Suit Pants
+S:gt.armor.hazmat.universal.boots.name=Universal Hazard Suit Boots
+S:gt.armor.hazmat.universal.chest.name=Universal Hazard Suit Shirt
+S:gt.armor.hazmat.universal.head.name=Universal Hazard Suit Mask
+S:gt.armor.hazmat.universal.legs.name=Universal Hazard Suit Pants
 S:gt.autocrafting.insert.blueprint=Insert an autocraftable Blueprint here
 S:gt.behaviour.cropnalyzer=Can scan Crops in World
 S:gt.behaviour.cure.zombie.strong=Can be used to cure strong Zombie Villagers

lang/gt_misc/zh_cn.lang

@@ -3,6 +3,30 @@ S:gt.advcrafting.drop.slot=自动提取你放在这个槽里的物品
 S:gt.advcrafting.insert.blueprint=把蓝图放在这里
 S:gt.advcrafting.neutral.slot=临时暂存处
 S:gt.advcrafting.put.to.storage=将合成栏里的物品返回到储存栏
+S:gt.armor.hazmat.biochemgas.boots.name=生化毒气防护靴
+S:gt.armor.hazmat.biochemgas.chest.name=生化毒气防护服
+S:gt.armor.hazmat.biochemgas.head.name=生化毒气防护面罩
+S:gt.armor.hazmat.biochemgas.legs.name=生化毒气防护裤
+S:gt.armor.hazmat.frost.boots.name=防冻靴
+S:gt.armor.hazmat.frost.chest.name=防冻服
+S:gt.armor.hazmat.frost.head.name=防冻面罩
+S:gt.armor.hazmat.frost.legs.name=防冻裤
+S:gt.armor.hazmat.heat.boots.name=防火靴
+S:gt.armor.hazmat.heat.chest.name=防火服
+S:gt.armor.hazmat.heat.head.name=防火面罩
+S:gt.armor.hazmat.heat.legs.name=防火裤
+S:gt.armor.hazmat.insect.boots.name=防蜂靴
+S:gt.armor.hazmat.insect.chest.name=防蜂裤
+S:gt.armor.hazmat.insect.head.name=防蜂面罩
+S:gt.armor.hazmat.insect.legs.name=防蜂服
+S:gt.armor.hazmat.radiation.boots.name=防辐射靴
+S:gt.armor.hazmat.radiation.chest.name=防辐射裤
+S:gt.armor.hazmat.radiation.head.name=防辐射面罩
+S:gt.armor.hazmat.radiation.legs.name=防辐射服
+S:gt.armor.hazmat.universal.boots.name=全防靴
+S:gt.armor.hazmat.universal.chest.name=全防裤
+S:gt.armor.hazmat.universal.head.name=全防面罩
+S:gt.armor.hazmat.universal.legs.name=全防服
 S:gt.autocrafting.insert.blueprint=把自动合成表蓝图放在这里
 S:gt.behaviour.cropnalyzer=能扫描世界中的作物
 S:gt.behaviour.cure.zombie.strong=可以治愈强壮的僵尸村民

lang/gt_multiitem/en_us.lang

@@ -1377,6 +1377,8 @@ S:gt.multiitem.technological.1025.name=Cover Controller
 S:gt.multiitem.technological.1026.name=Shutter Cover
 S:gt.multiitem.technological.1027.name=Button Panel Selector
 S:gt.multiitem.technological.1028.name=Warning Cover
+S:gt.multiitem.technological.1029.name=Redstone Conductor Cover (Accept)
+S:gt.multiitem.technological.1030.name=Redstone Conductor Cover (Emit)
 S:gt.multiitem.technological.10800.name=Empty Food Grade Mold
 S:gt.multiitem.technological.10801.name=Food Grade Mold (Bun)
 S:gt.multiitem.technological.10802.name=Food Grade Mold (Bread)

lang/gt_multiitem/zh_cn.lang

@@ -1377,6 +1377,8 @@ S:gt.multiitem.technological.1025.name=控制器覆盖板
 S:gt.multiitem.technological.1026.name=管道封闭覆盖板
 S:gt.multiitem.technological.1027.name=按钮覆盖板选择器
 S:gt.multiitem.technological.1028.name=警告标志覆盖板
+S:gt.multiitem.technological.1029.name=红石传导覆盖板 (接收)
+S:gt.multiitem.technological.1030.name=红石传导覆盖板 (发射)
 S:gt.multiitem.technological.10800.name=空白食物模具
 S:gt.multiitem.technological.10801.name=食物模具 (小面包)
 S:gt.multiitem.technological.10802.name=食物模具 (面包)