Update to GT v6.09.14

TeamNED · Dec 23, 2018 · ee5f578 · ee5f578
1 parent aa4e64f
commit ee5f578
Show file tree

Hide file tree

Showing 16 changed files with 2,566 additions and 299 deletions.
diff --git a/README.md b/README.md
@@ -6,9 +6,9 @@
 
 GregTech6 汉化项目，欢迎加入。
 
-当前适配版本为 v6.09.13，内置兼容 QwerTech-1.0.0-a.41
+当前适配版本为 v6.09.14，内置兼容 QwerTech-1.0.0-a.41
 
-Currently updated to GT 6.09.13, with built-in support for QwerTech-1.0.0-a.41
+Currently updated to GT 6.09.14, with built-in support for QwerTech-1.0.0-a.41
 
 [Weblate 翻译服务器传送门](https://weblate.exz.me/projects/gregtech/)
 

diff --git a/config/exceptions.yml b/config/exceptions.yml
@@ -3,7 +3,9 @@ S:gt.material.AnyCoalCarbon: 任意煤炭或碳
 S:gt.material.AnyIronOrSteel: 任意钢或铁
 S:gt.material.AnyStone: 任意种类的石头
 S:gt.material.AnyWood: 任意木头
+S:gt.material.Any: 任意材料
 
+S:oredict.rockGtHolystone.name: 圣石
 S:oredict.blockDustBone.name: 骨粉块
 S:oredict.gemEmpty.name: 空宝石
 S:oredict.ingotSteeleaf.name: 钢叶锭

diff --git a/config/glossary.yml b/config/glossary.yml
@@ -2110,6 +2110,13 @@ material:
   Red Onyx: 红色缟玛瑙
   Eudialyte: 异性石
   Iffesal: 伊夫萨尔
+  DominicanAmber: 多米尼加蓝琥珀
+  Licorice: 盐甘草糖
+  Marshmallow: 棉花糖
+  Marshmallow Pulp: 棉花糖碎屑
+  Nougat: 牛轧糖
+  PEZ: 皮礼士糖
+  Any: 任意
 
 energy_tier:
   ULV: ULV
@@ -2148,12 +2155,17 @@ stratum_prefix:
   Diorite: 闪长岩
   Limestone: 石灰岩
   Marble: 大理石
+  Nether: 下界
   Netherrack: 下界
   Endstone: 末地
   End: 末地
-  Vanillagranite: 花岗岩
-  Redgranite: 红色花岗岩
-  Blackgranite: 黑色花岗岩
+  Granite:
+  - regex: S:oredict.oreRedgranite.+
+    value: 红色花岗岩
+  - regex: S:oredict.oreBlackgranite.+
+    value: 黑色花岗岩
+  - regex: S:oredict.oreVanillagranite.+
+    value: 花岗岩
   Sandstone: 沙石
   Small: 贫瘠
   Basalt: 玄武岩

diff --git a/config/patterns.yml b/config/patterns.yml
@@ -706,6 +706,11 @@
   repl: "{gem_tier}{material}"
   token: gem
   value: (?P<gem_tier>[^ ]+) (?P<material>.+)\s*(Crystal)?
+- key: S:oredict.gem.+
+  priority: 800
+  repl: "{material}"
+  token: gem
+  value: (?P<material>.+)
 
 # bullet
 - key: S:oredict.bulletGt.+

diff --git a/lang/gt_material/en_us.lang b/lang/gt_material/en_us.lang
@@ -844,6 +844,7 @@ S:gt.material.Dioptase=Dioptase
 S:gt.material.Diorite=Diorite
 S:gt.material.Dolamide=Dolamide
 S:gt.material.Dolomite=Dolomite
+S:gt.material.DominicanAmber=DominicanAmber
 S:gt.material.Draconic=Draconic
 S:gt.material.Draconium=Draconium
 S:gt.material.DraconiumAwakened=Awakened Draconium
@@ -1093,6 +1094,7 @@ S:gt.material.Leather=Leather
 S:gt.material.Legendary=Legendary
 S:gt.material.Lemurite=Lemurite
 S:gt.material.Lepidolite=Lepidolite
+S:gt.material.Licorice=Licorice
 S:gt.material.LightBlue=Light Blue
 S:gt.material.LightGray=Light Gray
 S:gt.material.Lignite=Lignite Coal
@@ -1139,6 +1141,7 @@ S:gt.material.Manyullyn=Manyullyn
 S:gt.material.Marble=Marble
 S:gt.material.MarsSand=Mars Sand
 S:gt.material.MarsStone=Mars
+S:gt.material.Marshmallow=Marshmallow
 S:gt.material.MartianVitriol=Martian Vitriol
 S:gt.material.Master=Master
 S:gt.material.Mauftrium=Mauftrium
@@ -1215,6 +1218,7 @@ S:gt.material.Nitrogen=Nitrogen
 S:gt.material.NitrogenDioxide=Nitrogen Dioxide
 S:gt.material.NitrogenMonoxide=Nitrogen Monoxide
 S:gt.material.Nobelium=Nobelium
+S:gt.material.Nougat=Nougat
 S:gt.material.NutOil=Nut Oil
 S:gt.material.Nutmeg=Nutmeg
 S:gt.material.Oat=Oat
@@ -1247,6 +1251,7 @@ S:gt.material.OsmiumTetroxide=Osmium Tetroxide
 S:gt.material.Osmonium=Osmonium
 S:gt.material.Oureclase=Oureclase
 S:gt.material.Oxygen=Oxygen
+S:gt.material.PEZ=PEZ
 S:gt.material.Painite=Painite
 S:gt.material.Palis=Palis
 S:gt.material.Palladium=Palladium

diff --git a/lang/gt_material/zh_cn.lang b/lang/gt_material/zh_cn.lang
@@ -844,6 +844,7 @@ S:gt.material.Dioptase=翠铜石
 S:gt.material.Diorite=闪长岩
 S:gt.material.Dolamide=酰胺
 S:gt.material.Dolomite=白云岩
+S:gt.material.DominicanAmber=多米尼加蓝琥珀
 S:gt.material.Draconic=龙矿
 S:gt.material.Draconium=龙
 S:gt.material.DraconiumAwakened=觉醒龙
@@ -1094,6 +1095,7 @@ S:gt.material.Leather=皮革
 S:gt.material.Legendary=传奇的
 S:gt.material.Lemurite=利莫里亚
 S:gt.material.Lepidolite=锂云母
+S:gt.material.Licorice=盐甘草糖
 S:gt.material.LightBlue=淡蓝色
 S:gt.material.LightGray=淡灰色
 S:gt.material.Lignite=褐煤
@@ -1140,6 +1142,7 @@ S:gt.material.Manyullyn=玛玉灵
 S:gt.material.Marble=大理石
 S:gt.material.MarsSand=火星沙
 S:gt.material.MarsStone=火星岩石
+S:gt.material.Marshmallow=棉花糖
 S:gt.material.MartianVitriol=火星硫酸盐
 S:gt.material.Master=大师
 S:gt.material.Mauftrium=始源魂灵
@@ -1216,6 +1219,7 @@ S:gt.material.Nitrogen=氮
 S:gt.material.NitrogenDioxide=二氧化氮
 S:gt.material.NitrogenMonoxide=一氧化氮
 S:gt.material.Nobelium=锘
+S:gt.material.Nougat=牛轧糖
 S:gt.material.NutOil=坚果油
 S:gt.material.Nutmeg=肉豆蔻
 S:gt.material.Oat=燕麦
@@ -1248,6 +1252,7 @@ S:gt.material.OsmiumTetroxide=四氧化锇
 S:gt.material.Osmonium=Osmonium
 S:gt.material.Oureclase=大地结晶
 S:gt.material.Oxygen=氧气
+S:gt.material.PEZ=皮礼士糖
 S:gt.material.Painite=硅硼钙铝石
 S:gt.material.Palis=再构青金石水晶
 S:gt.material.Palladium=钯

diff --git a/lang/gt_multitileentity/en_us.lang b/lang/gt_multitileentity/en_us.lang
@@ -1553,6 +1553,7 @@ S:gt.multitileentity.32050.name=Lead Anvil
 S:gt.multitileentity.32051.name=Miniature Enviromine Portal
 S:gt.multitileentity.32052.name=Miniature Alfheim Portal
 S:gt.multitileentity.32053.name=Miniature Tropics Portal
+S:gt.multitileentity.32054.name=Miniature Candy Portal
 S:gt.multitileentity.32352.name=Wooden Panel
 S:gt.multitileentity.32353.name=Wooden Panel
 S:gt.multitileentity.32354.name=Wooden Panel

diff --git a/lang/gt_multitileentity/zh_cn.lang b/lang/gt_multitileentity/zh_cn.lang
@@ -1553,6 +1553,7 @@ S:gt.multitileentity.32050.name=铅砧
 S:gt.multitileentity.32051.name=微型矿界传送门
 S:gt.multitileentity.32052.name=微型艾尔夫海姆传送门
 S:gt.multitileentity.32053.name=微型蕴魔热带世界传送门
+S:gt.multitileentity.32054.name=微型糖果世界传送门
 S:gt.multitileentity.32352.name=木制覆盖板
 S:gt.multitileentity.32353.name=木制覆盖板
 S:gt.multitileentity.32354.name=木制覆盖板

diff --git a/lang/gt_recipe/en_us.lang b/lang/gt_recipe/en_us.lang
@@ -77,6 +77,7 @@ S:gt.recipe.slicer=Slicer
 S:gt.recipe.sluice=Sluice
 S:gt.recipe.smelter=Smelter
 S:gt.recipe.squeezer=Squeezer
+S:gt.recipe.trees=Family Tree
 S:gt.recipe.unboxinator=Unboxinator
 S:gt.recipe.vacuumfreezer=Vacuum Freezer
 S:gt.recipe.welder=Welding Machine

diff --git a/lang/gt_recipe/zh_cn.lang b/lang/gt_recipe/zh_cn.lang
@@ -77,6 +77,7 @@ S:gt.recipe.slicer=切片器
 S:gt.recipe.sluice=洗矿厂
 S:gt.recipe.smelter=液化炉
 S:gt.recipe.squeezer=榨汁机
+S:gt.recipe.trees=Family Tree
 S:gt.recipe.unboxinator=拆箱机
 S:gt.recipe.vacuumfreezer=真空冷冻器
 S:gt.recipe.welder=焊接机