Skip to content

Commit

Permalink
Merge pull request #275 from Kiwi233/master
Browse files Browse the repository at this point in the history 
2.2.0.0.V3
  • Loading branch information
@Kiwi233
Kiwi233 authored Oct 9, 2022
2 parents 59c2545 + f07cd91 commit d64041e
Show file tree
Hide file tree
Showing 32 changed files with 762 additions and 173 deletions.
44 changes: 22 additions & 22 deletions GregTech.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,7 @@ languagefile {
S:Material.painite=硅硼钙铝石
S:Material.palladium=钯
S:Material.palladiumenrichedammonia=富钯氨
S:Material.palladiummetallicpowder=钯金属粉
S:Material.palladiummetallicpowder=钯金属
S:Material.palladiumsalt=钯盐
S:Material.paper=纸
S:Material.peanutwood=花生木
Expand Down Expand Up @@ -1382,7 +1382,7 @@ languagefile {
S:Material.platinum=铂
S:Material.platinumconcentrate=浓缩铂
S:Material.platinumgroupsludge=铂系矿泥
S:Material.platinummetallicpowder=铂金属粉
S:Material.platinummetallicpowder=铂金属
S:Material.platinumresidue=铂渣
S:Material.platinumsalt=铂盐
S:Material.plutonium=钚-239
Expand Down Expand Up @@ -1487,15 +1487,15 @@ languagefile {
S:Material.rhodiumsulfate=硫酸铑
S:Material.rhodiumsulfatesolution=硫酸铑溶液
S:Material.rhyolite=流纹岩
S:Material.roastedantimony=煅烧锑
S:Material.roastedarsenic=煅烧砷
S:Material.roastedcobalt=煅烧钴
S:Material.roastedcopper=煅烧铜
S:Material.roastediron=煅烧铁
S:Material.roastedlead=煅烧铅
S:Material.roastednickel=煅烧镍
S:Material.roastedrareearthoxides=煅烧稀土氧化物
S:Material.roastedzinc=煅烧锌
S:Material.roastedantimony=焙烧锑
S:Material.roastedarsenic=焙烧砷
S:Material.roastedcobalt=焙烧钴
S:Material.roastedcopper=焙烧铜
S:Material.roastediron=焙烧铁
S:Material.roastedlead=焙烧铅
S:Material.roastednickel=焙烧镍
S:Material.roastedrareearthoxides=焙烧稀土氧化物
S:Material.roastedzinc=焙烧锌
S:Material.rocksalt=岩盐
S:Material.roquesite=硫铟铜
S:Material.rosegold=玫瑰金
Expand Down Expand Up @@ -4734,7 +4734,7 @@ languagefile {
S:TileEntity_DESCRIPTION_01172_Secondary_Index_02= 控制器： 顶层中央
S:TileEntity_DESCRIPTION_01172_Secondary_Index_03= 20x塑料混凝土方块(至少！)
S:TileEntity_DESCRIPTION_01172_Secondary_Index_04= 5.0%的塑料混凝土方块可以用防爆玻璃替换
S:TileEntity_DESCRIPTION_01172_Secondary_Index_05= 还有其他材料可以替换塑料混凝土方块.请查看congif以获知详情
S:TileEntity_DESCRIPTION_01172_Secondary_Index_05= 还有其他材料可以替换塑料混凝土方块.请查看config以获知详情
S:TileEntity_DESCRIPTION_01172_Secondary_Index_06= 顶层除控制器与边缘以外为过滤器机械方块
S:TileEntity_DESCRIPTION_01172_Secondary_Index_07= 能源仓： 任意机械方块(只接受一个)
S:TileEntity_DESCRIPTION_01172_Secondary_Index_08= 维护仓： 任意机械方块
Expand All @@ -4743,7 +4743,7 @@ languagefile {
S:TileEntity_DESCRIPTION_01172_Secondary_Index_11= 能量交互支持线缆二级管
S:TileEntity_DESCRIPTION_01172_Secondary_Index_12= 线缆二极管也计入10个机器外壳数量限制中
S:TileEntity_DESCRIPTION_01173_Index_00=放置，使用炸药激活
S:TileEntity_DESCRIPTION_01173_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个ITNT
S:TileEntity_DESCRIPTION_01173_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个工业TNT
S:TileEntity_DESCRIPTION_01173_Index_02=用闪存,扫描闪存,打印闪存,将内容打印到书上
S:TileEntity_DESCRIPTION_01173_Index_03=矿物勘探区为勘探者下方176x176大小的方块
S:TileEntity_DESCRIPTION_01173_Index_04=石油勘探区为3x3油田，每块油田为8x8区块
Expand Down Expand Up @@ -6256,17 +6256,17 @@ languagefile {
S:TileEntity_DESCRIPTION_02100_Index_00=已弃用，不要使用！无序合成以获取高级版本
S:TileEntity_DESCRIPTION_02101_Index_00=放已弃用，不要使用！无序合成以获取高级版本
S:TileEntity_DESCRIPTION_02102_Index_00=放置，使用炸药激活
S:TileEntity_DESCRIPTION_02102_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个ITNT
S:TileEntity_DESCRIPTION_02102_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个工业TNT
S:TileEntity_DESCRIPTION_02102_Index_02=用闪存,扫描闪存,打印闪存,将内容打印到书上
S:TileEntity_DESCRIPTION_02102_Index_03=矿物勘探区为勘探者下方80x80大小的方块
S:TileEntity_DESCRIPTION_02102_Index_04=石油勘探区为3x3油田，每块油田为8x8区块
S:TileEntity_DESCRIPTION_02103_Index_00=放置，使用炸药激活
S:TileEntity_DESCRIPTION_02103_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个ITNT
S:TileEntity_DESCRIPTION_02103_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个工业TNT
S:TileEntity_DESCRIPTION_02103_Index_02=用闪存,扫描闪存,打印闪存,将内容打印到书上
S:TileEntity_DESCRIPTION_02103_Index_03=矿物勘探区为勘探者下方112x112大小的方块
S:TileEntity_DESCRIPTION_02103_Index_04=石油勘探区为3x3油田，每块油田为8x8区块
S:TileEntity_DESCRIPTION_02104_Index_00=放置，使用炸药激活
S:TileEntity_DESCRIPTION_02104_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个ITNT
S:TileEntity_DESCRIPTION_02104_Index_01=2个火药桶，4个硝化甘油单元，16个TNT或8个工业TNT
S:TileEntity_DESCRIPTION_02104_Index_02=用闪存,扫描闪存,打印闪存,将内容打印到书上
S:TileEntity_DESCRIPTION_02104_Index_03=矿物勘探区为勘探者下方144x144大小的方块
S:TileEntity_DESCRIPTION_02104_Index_04=石油勘探区为3x3油田，每块油田为8x8区块
Expand Down Expand Up @@ -10253,7 +10253,7 @@ languagefile {
S:TileEntity_DESCRIPTION_13106_Index_07=添加更多或更换更好的电容可提升电容库容量
S:TileEntity_DESCRIPTION_13106_Index_08=-----------------------------------------
S:TileEntity_DESCRIPTION_13106_Index_09=使用螺丝刀启用无线模式
S:TileEntity_DESCRIPTION_13106_Index_10=仅在多方块结构中有§4UHV§7电容时方可启无线模式
S:TileEntity_DESCRIPTION_13106_Index_10=仅在多方块结构中有§4UHV§7电容时方可启用无线模式
S:TileEntity_DESCRIPTION_13106_Index_11=每§96,000§7t，电容库会尝试与无线EU网络进行再平衡.
S:TileEntity_DESCRIPTION_13106_Index_12=如果电容库中能量低于§c60,000,000,000,000§7EU时，
S:TileEntity_DESCRIPTION_13106_Index_13=将会从网络中抽取能量输入电容库中. 而超出此阈值时，
Expand Down Expand Up @@ -10335,7 +10335,7 @@ languagefile {
S:TileEntity_DESCRIPTION_14001_Index_01=§o等等，这不是真空吸尘器大军?
S:TileEntity_DESCRIPTION_14001_Index_02=戴森球指挥中心的控制器方块
S:TileEntity_DESCRIPTION_14001_Index_03=在输入总线中放入戴森球模块，将其发射至相邻的恒星.
S:TileEntity_DESCRIPTION_14001_Index_04=每个戴森球模块输出为f*262,144EU/t，f为基于所在世界的系数.
S:TileEntity_DESCRIPTION_14001_Index_04=每个戴森球模块输出为f*262,144EU/t，f为基于所在维度的系数.
S:TileEntity_DESCRIPTION_14001_Index_05=每秒m个戴森球模块中有n个会被损耗
S:TileEntity_DESCRIPTION_14001_Index_06= n=X*0.00005*m^1.001，X为0~2之间的正态分布随机数，均值为1.
S:TileEntity_DESCRIPTION_14001_Index_07=每秒消耗1,000L极寒之凛冰
Expand Down Expand Up @@ -12602,7 +12602,7 @@ languagefile {
S:TileEntity_DESCRIPTION_31050_Secondary_Index_02= 控制器： 顶层中央
S:TileEntity_DESCRIPTION_31050_Secondary_Index_03= 剩余方块为元素约束机械方块(至少138个！)
S:TileEntity_DESCRIPTION_31050_Secondary_Index_04= 24x质量发生机械方块
S:TileEntity_DESCRIPTION_31050_Secondary_Index_05= 24x抑制机械方块
S:TileEntity_DESCRIPTION_31050_Secondary_Index_05= 24x粒子抑制机械方块
S:TileEntity_DESCRIPTION_31050_Secondary_Index_06= 24x质量发生线圈
S:TileEntity_DESCRIPTION_31050_Secondary_Index_07= 20x高压流电容方块
S:TileEntity_DESCRIPTION_31050_Secondary_Index_08= 24x谐振腔 II
Expand Down Expand Up @@ -13736,7 +13736,7 @@ languagefile {
S:bw.werkstoff.00045.tooltip=
S:bw.werkstoff.00046.name=精炼铂盐
S:bw.werkstoff.00046.tooltip=
S:bw.werkstoff.00047.name=铂金属粉
S:bw.werkstoff.00047.name=铂金属
S:bw.werkstoff.00047.tooltip=??PtPdIrOsRhRu??
S:bw.werkstoff.00048.name=王水
S:bw.werkstoff.00048.tooltip=H₂SO₄HNO₃
Expand All @@ -13748,7 +13748,7 @@ languagefile {
S:bw.werkstoff.00051.tooltip=PtCl
S:bw.werkstoff.00052.name=富钯氨
S:bw.werkstoff.00052.tooltip=?Pd
S:bw.werkstoff.00053.name=钯金属粉
S:bw.werkstoff.00053.name=钯金属
S:bw.werkstoff.00053.tooltip=??Pd??
S:bw.werkstoff.00054.name=再沉淀钯
S:bw.werkstoff.00054.tooltip=Pd₂NH₄
Expand Down Expand Up @@ -14015,7 +14015,7 @@ languagefile {
S:bw.werkstoff.11107.name=氟碳镧铈稀土氧化物
S:bw.werkstoff.11108.name=酸浸氟碳镧铈稀土氧化物
S:bw.werkstoff.11109.name=脉石
S:bw.werkstoff.11110.name=煅烧稀土氧化物
S:bw.werkstoff.11110.name=焙烧稀土氧化物
S:bw.werkstoff.11111.name=湿稀土氧化物
S:bw.werkstoff.11112.name=氧化铈稀土氧化物
S:bw.werkstoff.11113.name=氟碳镧铈罕土氧化物
Expand Down
2 changes: 1 addition & 1 deletion config/Betterloadingscreen/tips/en_US.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ GT=Grind(折磨)和Tedium(枯燥)
可在机器的电池槽内放置电池为其供电
你可以将喷气背包放入LV机器的电池槽内充电
做好需要花费数小时才能搓出一台机器的准备!
原油 + 闪电 = 火. 别忘了为你的油井加盖!
石油 + 闪电 = 火. 别忘了为你的油井加盖!
核反应堆产出能量是IC2的10倍!(MOX-5倍)
记得早种棉花 - 你会用掉成吨的棉花
注意区分GT铝和匠魂铝
Expand Down
Loading

0 comments on commit d64041e

Please sign in to comment.