Skip to content

Commit

Permalink
Merge pull request #528 from Kiwi233/2.5.1
Browse files Browse the repository at this point in the history 
2.5.1
  • Loading branch information
@Kiwi233
Kiwi233 authored Dec 21, 2023
2 parents 9026846 + 78f2c72 commit 10d5e34
Show file tree
Hide file tree
Showing 14 changed files with 171 additions and 71 deletions.
30 changes: 17 additions & 13 deletions GregTech.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4956,7 +4956,7 @@ languagefile {
S:TileEntity_DESCRIPTION_01160_Index_05=氢气 - 减少20%氢气消耗，并额外输出25%的裂化产物
S:TileEntity_DESCRIPTION_01160_Index_06=蒸汽 - 额外输出50%的裂化产物
S:TileEntity_DESCRIPTION_01160_Index_07=(以上数值相对于化学反应釜裂化配方)
S:TileEntity_DESCRIPTION_01160_Index_08=在控制器GUI中放入相应编程电路
S:TileEntity_DESCRIPTION_01160_Index_08=在控制器GUI或输入总线中放入相应编程电路
S:TileEntity_DESCRIPTION_01160_Index_09=-----------------------------------------
S:TileEntity_DESCRIPTION_01160_Index_10=每提升一级线圈可减免10%的能耗,最多减免50%
S:TileEntity_DESCRIPTION_01160_Index_11=按住 §l[LSHIFT]§r§7 以显示结构指导
Expand All @@ -4972,6 +4972,7 @@ languagefile {
S:TileEntity_DESCRIPTION_01160_Secondary_Index_08=§f 输入仓：§7 任意左/右侧机械方块
S:TileEntity_DESCRIPTION_01160_Secondary_Index_09=§f 输出仓：§7 任意右/左侧机械方块
S:TileEntity_DESCRIPTION_01160_Secondary_Index_10= 输入/输出仓必须处在对侧
S:TileEntity_DESCRIPTION_01160_Secondary_Index_11=§f 输入总线：§7任意机械方块(可选,放置编程电路)
S:TileEntity_DESCRIPTION_01161_Index_00=能量的无线传输
S:TileEntity_DESCRIPTION_01161_Index_01=灌入氮等离子体
S:TileEntity_DESCRIPTION_01161_Index_02=以进行跨维度传输
Expand Down Expand Up @@ -10848,12 +10849,13 @@ languagefile {
S:TileEntity_DESCRIPTION_12792_Secondary_Index_04=§f 硼玻璃：§7 中间两层(中空)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_05= 玻璃等级限制了能源输入等级
S:TileEntity_DESCRIPTION_12792_Secondary_Index_06= 泥土来自RandomThings，必须为耕地
S:TileEntity_DESCRIPTION_12792_Secondary_Index_07= 紫色灯来自ProjectRedIllumination，可以点亮
S:TileEntity_DESCRIPTION_12792_Secondary_Index_08=§f 维护仓：§7 任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_09=§f 输入总线：§7任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_10=§f 输出总线：§7任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_11=§f 输入仓：§7 任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_12=§f 能源仓：§7 任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_07= 接受普通水和IC2蒸馏水
S:TileEntity_DESCRIPTION_12792_Secondary_Index_08= 紫色灯来自ProjectRedIllumination，可以点亮
S:TileEntity_DESCRIPTION_12792_Secondary_Index_09=§f 维护仓：§7 任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_10=§f 输入总线：§7任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_11=§f 输出总线：§7任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_12=§f 输入仓：§7 任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_13=§f 能源仓：§7 任意机械方块(除底层内侧)
S:TileEntity_DESCRIPTION_12793_Index_00=酸性发电机
S:TileEntity_DESCRIPTION_12793_Index_01=用化学势能产生电力
S:TileEntity_DESCRIPTION_12793_Index_02=电压：§e32
Expand Down Expand Up @@ -11016,7 +11018,7 @@ languagefile {
S:TileEntity_DESCRIPTION_13367_Index_05=氢气 - 减少20%氢气消耗，并额外输出25%的裂化产物
S:TileEntity_DESCRIPTION_13367_Index_06=蒸汽 - 额外输出50%的裂化产物
S:TileEntity_DESCRIPTION_13367_Index_07=(以上数值相对于化学反应釜裂化配方)
S:TileEntity_DESCRIPTION_13367_Index_08=在控制器GUI中放入相应编程电路
S:TileEntity_DESCRIPTION_13367_Index_08=在控制器GUI或输入总线中放入相应编程电路
S:TileEntity_DESCRIPTION_13367_Index_09=-----------------------------------------
S:TileEntity_DESCRIPTION_13367_Index_10=每提升一级线圈可减免10%的能耗,最多减免50%
S:TileEntity_DESCRIPTION_13367_Index_11=按住 §l[LSHIFT]§r§7 以显示结构指导
Expand All @@ -11030,6 +11032,7 @@ languagefile {
S:TileEntity_DESCRIPTION_13367_Secondary_Index_06=§f 输入仓：§7 提示方块：2/3号
S:TileEntity_DESCRIPTION_13367_Secondary_Index_07=§f 输出仓：§7 提示方块：3/2号
S:TileEntity_DESCRIPTION_13367_Secondary_Index_08=§f 输入仓：§7 蒸汽/氢气，提示方块：4号
S:TileEntity_DESCRIPTION_13367_Secondary_Index_09=§f 输入总线：§7提示方块(可选,放置编程电路)
S:TileEntity_DESCRIPTION_13532_Index_00=机器类型：§e装配线§r
S:TileEntity_DESCRIPTION_13532_Index_01=进阶装配线的控制器方块
S:TileEntity_DESCRIPTION_13532_Index_02=结构与普通装配线完全相同
Expand Down Expand Up @@ -11427,11 +11430,12 @@ languagefile {
S:TileEntity_DESCRIPTION_14202_Secondary_Index_03= 剩余方块为§7镀铜砖块§r(至少§6190§r个！)
S:TileEntity_DESCRIPTION_14202_Secondary_Index_04=§f 硼玻璃：§7 请参考全息投影
S:TileEntity_DESCRIPTION_14202_Secondary_Index_05= 玻璃等级限制了能源输入等级
S:TileEntity_DESCRIPTION_14202_Secondary_Index_06=§f 花：§7 泥土/草方块之上
S:TileEntity_DESCRIPTION_14202_Secondary_Index_07=§f 输入总线：§7任意机械方块
S:TileEntity_DESCRIPTION_14202_Secondary_Index_08=§f 输出总线：§7任意机械方块
S:TileEntity_DESCRIPTION_14202_Secondary_Index_09=§f 能源仓：§7 任意机械方块
S:TileEntity_DESCRIPTION_14202_Secondary_Index_10=§f 维护仓：§7 任意机械方块
S:TileEntity_DESCRIPTION_14202_Secondary_Index_06= 接受普通水和IC2蒸馏水
S:TileEntity_DESCRIPTION_14202_Secondary_Index_07=§f 花：§7 泥土/草方块之上
S:TileEntity_DESCRIPTION_14202_Secondary_Index_08=§f 输入总线：§7任意机械方块
S:TileEntity_DESCRIPTION_14202_Secondary_Index_09=§f 输出总线：§7任意机械方块
S:TileEntity_DESCRIPTION_14202_Secondary_Index_10=§f 能源仓：§7 任意机械方块
S:TileEntity_DESCRIPTION_14202_Secondary_Index_11=§f 维护仓：§7 任意机械方块
S:TileEntity_DESCRIPTION_15065_Index_00=§7将能量存储于全局网络中，上限为2^(2^31)EU.
S:TileEntity_DESCRIPTION_15065_Index_01=§7不连接导线，此方块可以从网络中抽取EU.
S:TileEntity_DESCRIPTION_15065_Index_02=添加者：§4§l§o§nC§6§l§o§no§a§l§o§nl§3§l§o§ne§5§l§o§nn§7§l & §9§lCloud
Expand Down
30 changes: 17 additions & 13 deletions GregTech_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4956,7 +4956,7 @@ languagefile {
S:TileEntity_DESCRIPTION_01160_Index_05=Hydro - Consumes 20% less Hydrogen and outputs 25% more cracked fluid
S:TileEntity_DESCRIPTION_01160_Index_06=Steam - Outputs 50% more cracked fluid
S:TileEntity_DESCRIPTION_01160_Index_07=(Values compared to cracking in the Chemical Reactor)
S:TileEntity_DESCRIPTION_01160_Index_08=Place the appropriate circuit in the controller
S:TileEntity_DESCRIPTION_01160_Index_08=Place the appropriate circuit in the controller or an input bus
S:TileEntity_DESCRIPTION_01160_Index_09=-----------------------------------------
S:TileEntity_DESCRIPTION_01160_Index_10=Gets 10% EU/t reduction per coil tier, up to a maximum of 50%
S:TileEntity_DESCRIPTION_01160_Index_11=Hold §l[LSHIFT]§r§7 to display structure guidelines
Expand All @@ -4972,6 +4972,7 @@ languagefile {
S:TileEntity_DESCRIPTION_01160_Secondary_Index_08=§f Input Hatch: §7Any left/right side casing
S:TileEntity_DESCRIPTION_01160_Secondary_Index_09=§f Output Hatch: §7Any right/left side casing
S:TileEntity_DESCRIPTION_01160_Secondary_Index_10= Input/Output Hatches must be on opposite sides!
S:TileEntity_DESCRIPTION_01160_Secondary_Index_11=§f Input Bus: §7Any middle ring casing, optional for programmed circuit automation
S:TileEntity_DESCRIPTION_01161_Index_00=Transmits Energy Wirelessly
S:TileEntity_DESCRIPTION_01161_Index_01=Use Nitrogen Plasma
S:TileEntity_DESCRIPTION_01161_Index_02=for Inter-dimensional transmission
Expand Down Expand Up @@ -10848,12 +10849,13 @@ languagefile {
S:TileEntity_DESCRIPTION_12792_Secondary_Index_04=§f Borosilicate Glass: §7Hollow two middle layers
S:TileEntity_DESCRIPTION_12792_Secondary_Index_05= The glass tier limits the Energy Input tier
S:TileEntity_DESCRIPTION_12792_Secondary_Index_06= The dirt is from RandomThings, must be tilled
S:TileEntity_DESCRIPTION_12792_Secondary_Index_07= Purple lamps are from ProjectRedIllumination. They can be powered and/or inverted
S:TileEntity_DESCRIPTION_12792_Secondary_Index_08=§f Maintenance Hatch: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_09=§f Input Bus: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_10=§f Output Bus: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_11=§f Input Hatch: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_12=§f Energy Hatch: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_07= Regular water and IC2 Distilled Water are accepted
S:TileEntity_DESCRIPTION_12792_Secondary_Index_08= Purple lamps are from ProjectRedIllumination. They can be powered and/or inverted
S:TileEntity_DESCRIPTION_12792_Secondary_Index_09=§f Maintenance Hatch: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_10=§f Input Bus: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_11=§f Output Bus: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_12=§f Input Hatch: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12792_Secondary_Index_13=§f Energy Hatch: §7Any casing (Except inner bottom ones)
S:TileEntity_DESCRIPTION_12793_Index_00=An Acid Generator
S:TileEntity_DESCRIPTION_12793_Index_01=Creates Power from Chemical Energy Potentials.
S:TileEntity_DESCRIPTION_12793_Index_02=Voltage: §e32
Expand Down Expand Up @@ -11016,7 +11018,7 @@ languagefile {
S:TileEntity_DESCRIPTION_13367_Index_05=Hydro - Consumes 20% less Hydrogen and outputs 25% more cracked fluid
S:TileEntity_DESCRIPTION_13367_Index_06=Steam - Outputs 50% more cracked fluid
S:TileEntity_DESCRIPTION_13367_Index_07=(Values compared to cracking in the Chemical Reactor)
S:TileEntity_DESCRIPTION_13367_Index_08=Place the appropriate circuit in the controller
S:TileEntity_DESCRIPTION_13367_Index_08=Place the appropriate circuit in the controller or an input bus
S:TileEntity_DESCRIPTION_13367_Index_09=-----------------------------------------
S:TileEntity_DESCRIPTION_13367_Index_10=Gets 10% EU/t reduction per coil tier, up to a maximum of 50%
S:TileEntity_DESCRIPTION_13367_Index_11=Hold §l[LSHIFT]§r§7 to display structure guidelines
Expand All @@ -11030,6 +11032,7 @@ languagefile {
S:TileEntity_DESCRIPTION_13367_Secondary_Index_06=§f Input Hatch: §7Hint block
S:TileEntity_DESCRIPTION_13367_Secondary_Index_07=§f Output Hatch: §7Hint block
S:TileEntity_DESCRIPTION_13367_Secondary_Index_08=§f Input Hatch: §7Steam/Hydrogen ONLY, Hint block
S:TileEntity_DESCRIPTION_13367_Secondary_Index_09=§f Input Bus: §7Optional, for programmed circuit automation. Hint block
S:TileEntity_DESCRIPTION_13532_Index_00=Machine Type: §eAssembling Line§r
S:TileEntity_DESCRIPTION_13532_Index_01=Controller block for the Advanced Assembling Line
S:TileEntity_DESCRIPTION_13532_Index_02=Built exactly the same as standard Assembling Line
Expand Down Expand Up @@ -11427,11 +11430,12 @@ languagefile {
S:TileEntity_DESCRIPTION_14202_Secondary_Index_03=§6 190x §r§7Bronze Plated Bricks (minimum)
S:TileEntity_DESCRIPTION_14202_Secondary_Index_04=§f Borosilicate Glass: §7Look at the hologram
S:TileEntity_DESCRIPTION_14202_Secondary_Index_05= The glass tier limits the Energy Input tier
S:TileEntity_DESCRIPTION_14202_Secondary_Index_06=§f Flowers: §7On dirt/grass
S:TileEntity_DESCRIPTION_14202_Secondary_Index_07=§f Input Bus: §7Any casing
S:TileEntity_DESCRIPTION_14202_Secondary_Index_08=§f Output Bus: §7Any casing
S:TileEntity_DESCRIPTION_14202_Secondary_Index_09=§f Energy Hatch: §7Any casing
S:TileEntity_DESCRIPTION_14202_Secondary_Index_10=§f Maintenance Hatch: §7Any casing
S:TileEntity_DESCRIPTION_14202_Secondary_Index_06= Regular water and IC2 Distilled Water are accepted
S:TileEntity_DESCRIPTION_14202_Secondary_Index_07=§f Flowers: §7On dirt/grass
S:TileEntity_DESCRIPTION_14202_Secondary_Index_08=§f Input Bus: §7Any casing
S:TileEntity_DESCRIPTION_14202_Secondary_Index_09=§f Output Bus: §7Any casing
S:TileEntity_DESCRIPTION_14202_Secondary_Index_10=§f Energy Hatch: §7Any casing
S:TileEntity_DESCRIPTION_14202_Secondary_Index_11=§f Maintenance Hatch: §7Any casing
S:TileEntity_DESCRIPTION_15065_Index_00=§7Stores energy globally in a network, up to 2^(2^31) EU.
S:TileEntity_DESCRIPTION_15065_Index_01=§7Does not connect to wires. This block withdraws EU from the network.
S:TileEntity_DESCRIPTION_15065_Index_02=Author: §4§l§o§nC§6§l§o§no§a§l§o§nl§3§l§o§ne§5§l§o§nn§7§l & §9§lCloud
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

2023-12-21

2.5.0 版本汉化未审核版本完成。
2.5.1 版本汉化未审核版本完成。

## 汉化使用方式
1、找到release内对应版本
Expand Down
Loading

0 comments on commit 10d5e34

Please sign in to comment.