Merge branch 'main' into biomancy

Author: ZHAY10086

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: I18n自动汉化更新模组问题
     url: https://github.com/CFPAOrg/I18nUpdateMod3/issues/new

.github/ISSUE_TEMPLATE/other.yml

@@ -44,6 +44,10 @@ labelPRBasedOnFilePath:
     Patchouli:
         - "projects/**/patchouli_books/**"
 
+    GuideME:
+        - "projects/**/guides/**"
+        - "projects/**/ae2guide/**"
+
     source:
         - "src/**"
 

.github/ISSUE_TEMPLATE/translation_feedback.yml

@@ -6,9 +6,9 @@
         ],
         "exclusionMods": [],
         "exclusionNamespaces": [
+            "cataclysm",
             "alexscaves",
-            "biomancy",
-            "cataclysm"
+            "biomancy"
         ]
     },
     "floating": {

.github/boring-cyborg.yml

@@ -307,7 +307,7 @@ item.fruit_cherr.name=樱桃
 item.fruit_cocon.name=椰子
 item.fruit_grapf.name=柚子
 item.fruit_grnap.name=青苹果
-item.fruit_kiwi.name=奇异果
+item.fruit_kiwi.name=猕猴桃
 item.fruit_lemon.name=柠檬
 item.fruit_lime.name=青柠檬
 item.fruit_mango.name=芒果
@@ -545,7 +545,7 @@ tile.climb_cgrpv.name=葡萄藤
 tile.climb_gldho.name=蛇麻
 tile.climb_hyacb.name=扁豆
 tile.climb_japcr.name=日本爬行藤
-tile.climb_kiwi.name=奇异果
+tile.climb_kiwi.name=猕猴桃
 tile.climb_maidf.name=美国铁线蕨
 tile.climb_porce.name=瓷色浆果
 tile.climb_swpea_blu.name=蓝天鹅甜豌豆

config/packer/1.20.json

@@ -16,13 +16,13 @@ tile.block_marble_brick_wall.name=大理石砖墙
 tile.block_marble_arch_wall.name=大理石横梁墙
 tile.block_marble_chiseled_wall.name=錾制大理石墙
 tile.block_marble_engraved_wall.name=凹面大理石墙
-tile.block_marble_runed_wall.name=精致大理石墙
+tile.block_marble_runed_wall.name=符纹大理石墙
 tile.block_black_marble_wall.name=炭黑大理石墙
 tile.block_black_marble_brick_wall.name=炭黑大理石砖墙
 tile.block_black_marble_arch_wall.name=炭黑大理石横梁墙
 tile.block_black_marble_chiseled_wall.name=炭黑錾制大理石墙
 tile.block_black_marble_engraved_wall.name=炭黑凹面大理石墙
-tile.block_black_marble_runed_wall.name=炭黑精致大理石墙
+tile.block_black_marble_runed_wall.name=炭黑符纹大理石墙
 tile.block_starmetal.name=星辉块
 
 # Keybinds

projects/1.12.2/assets/1UNKNOWN/pmp/lang/zh_cn.lang

@@ -1187,7 +1187,7 @@ tile.blockblackmarble.chiseled.name=錾制炭黑大理石
 tile.blockblackmarble.engraved.name=凹面炭黑大理石
 tile.blockblackmarble.pillar.name=炭黑大理石柱
 tile.blockblackmarble.raw.name=炭黑大理石
-tile.blockblackmarble.runed.name=精致炭黑大理石
+tile.blockblackmarble.runed.name=符纹炭黑大理石
 tile.blockbore.name=万象泉
 tile.blockborehead.liquid.name=纳耳狂曼引口
 tile.blockborehead.ore.name=佩特幔提引口
@@ -1231,7 +1231,7 @@ tile.blockmarble.chiseled.name=錾制大理石
 tile.blockmarble.engraved.name=凹面大理石
 tile.blockmarble.pillar.name=大理石柱
 tile.blockmarble.raw.name=大理石
-tile.blockmarble.runed.name=精致大理石柱
+tile.blockmarble.runed.name=符纹大理石
 tile.blockmarbleslab.bricks.name=大理石台阶
 tile.blockmarblestairs.name=大理石楼梯
 tile.blockobservatory.name=观星台

projects/1.12.2/assets/astral-additions/astraladditions/lang/zh_cn.lang

@@ -52,6 +52,9 @@ chat.gateCopier.warning.load=§6Warning: Gate triggers/actions might be missing!
 chat.gateCopier.warning.slots=§6Warning: Target has less slots!
 chat.gateCopier.warning.triggerParameters=§6Warning: Target has less trigger parameters!
 chat.pipe.power.iron.mode=Switched to %d MJ/t limit
+gate.action.pipe.power_limit=Switch to %d MJ/t limit
+chat.pipe.rf.iron.mode=Switched to %d RF/t limit
+gate.action.pipe.rf_limit=Switch to %d RF/t limit
 chat.pipe.power.iron.mode.numberless=Switched to %s limit
 chat.pipe.power.iron.level.20=Very Low
 chat.pipe.power.iron.level.40=Low
@@ -197,6 +200,13 @@ buildcraft.mj.flow.short=%s MJ/t
 buildcraft.mj.flow.seconds.long=%s Minecraft Joules per second
 buildcraft.mj.flow.seconds.short=%s MJ/s
 
+buildcraft.rf.static.long=%s Redstone Flux
+buildcraft.rf.static.short=%s RF
+buildcraft.rf.flow.long=%s Redstone Flux per tick
+buildcraft.rf.flow.short=%s RF/t
+buildcraft.rf.flow.seconds.long=%s Redstone Flux per second
+buildcraft.rf.flow.seconds.short=%s RF/s
+
 fillerpattern.clear=Clear
 fillerpattern.fill=Fill
 fillerpattern.flatten=Flatten
@@ -402,6 +412,8 @@ gui.progress=Progress
 gui.leftToBreak=To break
 gui.leftToPlace=To place
 
+buildcraft.gui.rf_engine.upgrade_types=Compatible Upgrades:
+
 item.bucketFuel.name=Fuel Bucket
 item.bucketOil.name=Oil Bucket
 item.diamondShard.name=Diamond Shard
@@ -491,6 +503,16 @@ item.PipePowerIron.name=Iron Kinesis Pipe
 item.PipePowerGold.name=Golden Kinesis Pipe
 item.PipePowerDiamond.name=Diamond Kinesis Pipe
 item.PipePowerEmerald.name=Emerald Kinesis Pipe
+item.PipePowerWoodenDiamond.name=Wooden Diamond Kinesis Pipe
+item.PipeRedstoneFluxWood.name=Wooden Redstone Flux Pipe
+item.PipeRedstoneFluxCobblestone.name=Cobblestone Redstone Flux Pipe
+item.PipeRedstoneFluxStone.name=Stone Redstone Flux Pipe
+item.PipeRedstoneFluxQuartz.name=Quartz Redstone Flux Pipe
+item.PipeRedstoneFluxIron.name=Iron Redstone Flux Pipe
+item.PipeRedstoneFluxGold.name=Golden Redstone Flux Pipe
+item.PipeRedstoneFluxDiamond.name=Diamond Redstone Flux Pipe
+item.PipeRedstoneFluxEmerald.name=Emerald Redstone Flux Pipe
+item.PipeRedstoneFluxWoodenDiamond.name=Wooden Diamond Redstone Flux Pipe
 item.PipeItemsStripes.name=Stripes Transport Pipe
 item.PipeStructureCobblestone.name=Cobblestone Structure Pipe
 item.PipeItemsVoid.name=Void Transport Pipe
@@ -510,6 +532,7 @@ item.PipePlug.name=Pipe Plug
 item.light_sensor.name=Light Sensor
 item.Lens.name=Lens
 item.Filter.name=Filter
+item.timer.name=Timer
 item.PipePowerAdapter.name=Power Adapter
 item.debugger.name=Debugger
 item.debugger.warning=Use only for testing! Leaks secrets.
@@ -539,9 +562,14 @@ tile.chargingTableBlock.name=Charging Table
 tile.chargingTableBlock.tip=Nothing can be charged with this!
 tile.constructionMarkerBlock.name=Construction Mark
 tile.engineCreative.name=Creative Engine
+tile.engineCreative.tip=Right click with a wrench to change power output level.
 tile.engineIron.name=Combustion Engine
 tile.engineStone.name=Stirling Engine
 tile.engineWood.name=Redstone Engine
+tile.engineRf.name=RF Engine
+tile.engineRf.tip=Converts Redstone Flux to Minecraft Joules
+tile.mjDynamo.name=MJ Dynamo
+tile.mjDynamo.tip=Converts Minecraft Joules to Redstone Flux
 tile.fillerBlock.name=Filler
 tile.fillerBlock.tip=Not usable in survival.
 tile.filteredBufferBlock.name=Filtered Buffer
@@ -612,9 +640,14 @@ tip.PipeItemsObsidian=Sucks up items
 tip.PipeItemsSandstone=Only connects to other pipes
 tip.PipeItemsVoid=Destroys items
 tip.PipeItemsWood=Extraction pipe
-tip.PipePowerEmerald=Power Input Pipe
+tip.PipePowerWoodenDiamond=Power Input Pipe
+tip.PipeRedstoneFluxWoodenDiamond=Redstone Flux Input Pipe
+tip.PipePowerIron=Selectable Limiter Pipe
 tip.PipePowerDiamond=Selectable Limiter Pipe
+tip.PipeRedstoneFluxIron=Selectable Limiter Pipe
+tip.PipeRedstoneFluxDiamond=Selectable Limiter Pipe
 tip.PipePowerSandstone=Only connects to other pipes
+tip.PipeRedstoneFluxSandstone=Only connects to other pipes
 tip.PipePowerWood=Power Input Pipe
 tip.PipeStructureCobblestone=Support pipe
 tip.deprecated=Deprecated
@@ -775,6 +808,13 @@ buildcraft.help.stone_engine.fuel.title=Fuel input
 buildcraft.help.stone_engine.flame=THIS BURNS AND THIS HELP ISN'T DONE YET.
 buildcraft.help.stone_engine.fuel=Accepts any fuel that a furnace does.
 
+buildcraft.help.rf_engine.upgrades.title=Upgrades
+buildcraft.help.rf_engine.upgrades.desc=Add compatible gears to\nincrease conversion rate.\n\nMax 1 gear per slot.
+buildcraft.help.rf_engine.rf_battery.title=RF Battery
+buildcraft.help.rf_engine.rf_battery.desc=Converts %s\nto %s
+buildcraft.help.mj_dynamo.rf_battery.title=RF Battery
+buildcraft.help.mj_dynamo.rf_battery.desc=Converts %s\nto %s
+
 command.buildcraft.buildcraft.op.desc=- %s : Op FakePlayer
 command.buildcraft.buildcraft.op.help=Gives OP rights to the BC FakePlayer (acts in the name of quarries, robots, etc.)
 command.buildcraft.buildcraft.op.format=Format: /%s
@@ -917,4 +957,4 @@ advancements.buildcraftbuilders.building_for_the_future.title=Building for the f
 advancements.buildcraftbuilders.building_for_the_future.description=Set a filler on a loop for long term automation
 
 advancements.buildcraftbuilders.destroying_the_world.title=Destorying the world
-advancements.buildcraftbuilders.destroying_the_world.description=Have two or more 64 x 64 sized quarries running at once at full speed
+advancements.buildcraftbuilders.destroying_the_world.description=Have two or more 64 x 64 sized quarries running at once at full speed

projects/1.12.2/assets/astral-sorcery/astralsorcery/lang/zh_cn.lang

@@ -51,8 +51,11 @@ chat.gateCopier.warning.logic=§6警告：目标的逻辑类型不同！
 chat.gateCopier.warning.load=§6警告：门触发/操作配置可能丢失！
 chat.gateCopier.warning.slots=§6警告：目标槽数不足！
 chat.gateCopier.warning.triggerParameters=§6警告：目标的触发参数不足！
-chat.pipe.power.iron.mode=切换为 %d MJ/t 限制
-chat.pipe.power.iron.mode.numberless=切换为 %s 限制
+chat.pipe.power.iron.mode=已切换为 %d MJ/t 限制
+gate.action.pipe.power_limit=切换为 %d MJ/t 限制
+chat.pipe.rf.iron.mode=已切换为 %d RF/t 限制
+gate.action.pipe.rf_limit=切换为 %d RF/t 限制
+chat.pipe.power.iron.mode.numberless=已切换为 %s 限制
 chat.pipe.power.iron.level.20=极低
 chat.pipe.power.iron.level.40=低
 chat.pipe.power.iron.level.80=较低
@@ -197,6 +200,13 @@ buildcraft.mj.flow.short=%s MJ/t
 buildcraft.mj.flow.seconds.long=每秒 %s Minecraft 焦耳
 buildcraft.mj.flow.seconds.short=%s MJ/s
 
+buildcraft.rf.static.long=%s 红石通量
+buildcraft.rf.static.short=%s RF
+buildcraft.rf.flow.long=每游戏刻 %s 红石通量
+buildcraft.rf.flow.short=%s RF/t
+buildcraft.rf.flow.seconds.long=每秒 %s 红石通量
+buildcraft.rf.flow.seconds.short=%s RF/s
+
 fillerpattern.clear=清除
 fillerpattern.fill=填充
 fillerpattern.flatten=平整
@@ -402,6 +412,8 @@ gui.progress=进度
 gui.leftToBreak=破坏
 gui.leftToPlace=放置
 
+buildcraft.gui.rf_engine.upgrade_types=兼容的升级：
+
 item.bucketFuel.name=燃油桶
 item.bucketOil.name=原油桶
 item.diamondShard.name=钻石碎片
@@ -457,7 +469,7 @@ item.buildcraft_pipe_granite_polished_item.name=磨制花岗岩物品管道
 
 item.PipeItemsWood.name=木物品管道
 item.PipeItemsCobblestone.name=圆石物品管道
-item.PipeItemsStone.name=石物品管道
+item.PipeItemsStone.name=石头物品管道
 item.PipeItemsAndesite.name=安山岩物品管道
 item.PipeItemsDiorite.name=闪长岩物品管道
 item.PipeItemsGranite.name=花岗岩物品管道
@@ -466,7 +478,7 @@ item.PipeItemsIron.name=铁物品管道
 item.PipeItemsGold.name=金物品管道
 item.PipeItemsDiamond.name=钻石物品管道
 item.PipeItemsObsidian.name=黑曜石物品管道
-item.PipeItemsWoodenDiamond.name=木质钻石管道
+item.PipeItemsWoodenDiamond.name=木钻石管道
 item.PipeItemsLapis.name=青金石物品管道
 item.PipeItemsDaizuli.name=靛金刚物品管道
 item.PipeItemsEmzuli.name=靛翡翠物品管道
@@ -480,17 +492,27 @@ item.PipeFluidsGranite.name=花岗岩流体管道
 item.PipeFluidsIron.name=铁流体管道
 item.PipeFluidsQuartz.name=石英流体管道
 item.PipeFluidsGold.name=金流体管道
-item.PipeFluidsWoodenDiamond.name=木质钻石流体管道
+item.PipeFluidsWoodenDiamond.name=木钻石流体管道
 item.PipeFluidsDiamond.name=钻石流体管道
 item.PipeFluidsClay.name=粘土流体管道
 item.PipePowerWood.name=木能量管道
 item.PipePowerCobblestone.name=圆石能量管道
-item.PipePowerStone.name=石能量管道
+item.PipePowerStone.name=石头能量管道
 item.PipePowerQuartz.name=石英能量管道
 item.PipePowerIron.name=铁能量管道
 item.PipePowerGold.name=金能量管道
 item.PipePowerDiamond.name=钻石能量管道
 item.PipePowerEmerald.name=绿宝石能量管道
+item.PipePowerWoodenDiamond.name=木钻石能量管道
+item.PipeRedstoneFluxWood.name=木红石通量管道
+item.PipeRedstoneFluxCobblestone.name=圆石红石通量管道
+item.PipeRedstoneFluxStone.name=石头红石通量管道
+item.PipeRedstoneFluxQuartz.name=石英红石通量管道
+item.PipeRedstoneFluxIron.name=铁红石通量管道
+item.PipeRedstoneFluxGold.name=金红石通量管道
+item.PipeRedstoneFluxDiamond.name=钻石红石通量管道
+item.PipeRedstoneFluxEmerald.name=绿宝石红石通量管道
+item.PipeRedstoneFluxWoodenDiamond.name=木钻石红石通量管道
 item.PipeItemsStripes.name=条纹管道
 item.PipeStructureCobblestone.name=圆石建筑管道
 item.PipeItemsVoid.name=虚空物品管道
@@ -510,6 +532,7 @@ item.PipePlug.name=管塞
 item.light_sensor.name=光传感器
 item.Lens.name=透镜
 item.Filter.name=滤镜
+item.timer.name=计时器
 item.PipePowerAdapter.name=能量接收器
 item.debugger.name=调试工具
 item.debugger.warning=仅用于测试！会泄密。
@@ -539,9 +562,14 @@ tile.chargingTableBlock.name=充能台
 tile.chargingTableBlock.tip=没有什么可以被控告的！
 tile.constructionMarkerBlock.name=建设标
 tile.engineCreative.name=创造模式引擎
+tile.engineCreative.tip=使用扳手右击以更改能量输出等级。
 tile.engineIron.name=燃油引擎
 tile.engineStone.name=斯特林引擎
 tile.engineWood.name=红石引擎
+tile.engineRf.name=RF 引擎
+tile.engineRf.tip=将红石通量转换为 Minecraft 焦耳
+tile.mjDynamo.name=MJ 能源炉
+tile.mjDynamo.tip=将 Minecraft 焦耳转换为红石通量
 tile.fillerBlock.name=填充机
 tile.fillerBlock.tip=不能用于生存。
 tile.filteredBufferBlock.name=过滤缓存器
@@ -612,9 +640,14 @@ tip.PipeItemsObsidian=吸收物品
 tip.PipeItemsSandstone=只会连接其他管道
 tip.PipeItemsVoid=销毁物品
 tip.PipeItemsWood=提取管道
-tip.PipePowerEmerald=能量输入管道
+tip.PipePowerWoodenDiamond=能量输入管道
+tip.PipeRedstoneFluxWoodenDiamond=红石通量输入管道
+tip.PipePowerIron=可选择的限流管道
 tip.PipePowerDiamond=可选择的限流管道
+tip.PipeRedstoneFluxIron=可选择的限流管道
+tip.PipeRedstoneFluxDiamond=可选择的限流管道
 tip.PipePowerSandstone=只能连接其他管道
+tip.PipeRedstoneFluxSandstone=只能连接其他管道
 tip.PipePowerWood=能量输入管道
 tip.PipeStructureCobblestone=支撑类管道
 tip.deprecated=已弃用
@@ -775,6 +808,13 @@ buildcraft.help.stone_engine.fuel.title=燃料输入
 buildcraft.help.stone_engine.flame=燃烧和帮助部分还没有完成。
 buildcraft.help.stone_engine.fuel=接受任何熔炉可接受的燃料。
 
+buildcraft.help.rf_engine.upgrades.title=升级
+buildcraft.help.rf_engine.upgrades.desc=添加兼容的升级\n以提高转换速率。\n\n每个槽位最多放置 1 个齿轮。
+buildcraft.help.rf_engine.rf_battery.title=RF 电池
+buildcraft.help.rf_engine.rf_battery.desc=将 %s\n转换为 %s
+buildcraft.help.mj_dynamo.rf_battery.title=RF 电池
+buildcraft.help.mj_dynamo.rf_battery.desc=将 %s\n转换为 %s
+
 command.buildcraft.buildcraft.op.desc=- %s：Op FakePlayer
 command.buildcraft.buildcraft.op.help=给予 BC 模拟玩家（以采石场，机器人等名义执行动作）服务器 OP 权限。
 command.buildcraft.buildcraft.op.format=格式：/%s
@@ -917,4 +957,4 @@ advancements.buildcraftbuilders.building_for_the_future.title=建设未来
 advancements.buildcraftbuilders.building_for_the_future.description=设置填充机为循环模式，从而进行自动化
 
 advancements.buildcraftbuilders.destroying_the_world.title=毁灭世界
-advancements.buildcraftbuilders.destroying_the_world.description=有两个以上的 64 x 64 大小的采石场，并进行全速运行
+advancements.buildcraftbuilders.destroying_the_world.description=有两个以上的 64 x 64 大小的采石场，并进行全速运行