Merge branch 'CFPAOrg:main' into main

.github/workflows/stale.yml

@@ -0,0 +1,25 @@
+name: Close inactive PRs
+on:
+  schedule:
+    # 每天凌晨5点
+    - cron: "0 21 * * *"
+  workflow_dispatch:
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v5
+        with:
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          stale-pr-message: "提醒：审核者需要您的回复，7+7已进入第二阶段，该PR即将关闭。"
+          close-pr-message: "因审核者请求您更新该PR，且回复时间超过规定期限，该PR现暂时关闭。如您需再次提交可重新打开该PR，感谢您的贡献:heart:。"
+          days-before-pr-stale: 7
+          days-before-pr-close: 7
+          any-of-pr-labels: "needs author action,changes required"
+          stale-pr-label: "ready to reject"
+          start-date: 2023-02-11
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -391,22 +391,22 @@ tile.block_infinity_fog.name=基岩尘
 tile.block_infinity_fog.tooltip.common.line1=§4§o危险
 tile.block_infinity_fog.tooltip.detailed.line1=当基岩粉被磨成细小尘埃时，它开始展现出基岩的特性。
 tile.block_infinity_fog.tooltip.detailed.line2=释放到空气中形成一个挥发性尘埃云，触碰它至少是不健康的。当尘埃落定时，它可能会留下一些令人讨厌的东西。
-tile.block_infinity_fog.tooltip.detailed.line3=§6有几率生成§l末影人§r§6和其他怪物。
+tile.block_infinity_fog.tooltip.detailed.line3=§6有概率生成§l末影人§r§6和其他怪物。
 
 tile.block_holy_fog.name=荧石纳米颗粒（旧）
 
 tile.block_holier_fog.name=荧石纳米颗粒
 tile.block_holier_fog.tooltip.common.line1=（PM2.5）
 tile.block_holier_fog.tooltip.detailed.line1=当荧石被磨成细小的尘埃时，它将散布在空气中无法消散。
 tile.block_holier_fog.tooltip.detailed.line2=一个荧石纳米颗粒可以覆盖 16 格方块的空间。
-tile.block_holier_fog.tooltip.detailed.line3=有几率对§l亡灵生物§r§6造成伤害。会被液体和雨水洗掉。
+tile.block_holier_fog.tooltip.detailed.line3=有概率对§l亡灵生物§r§6造成伤害。会被流体和雨水洗掉。
 
 tile.block_infinity_0.name=基岩粉块
-tile.block_infinity_0.tooltip.common.line1=并不能算作固体
+tile.block_infinity_0.tooltip.common.line1=不怎么牢固
 tile.block_infinity_1.name=压缩基岩粉块
-tile.block_infinity_1.tooltip.common.line1=并不能算作固体
+tile.block_infinity_1.tooltip.common.line1=不怎么牢固
 tile.block_infinity_2.name=二重压缩基岩粉块
-tile.block_infinity_2.tooltip.common.line1=并不能算作固体
+tile.block_infinity_2.tooltip.common.line1=不怎么牢固
 
 tile.block_alloy.name=合金块
 tile.block_alloy.conductive_iron.name=导电铁块
@@ -798,13 +798,13 @@ enderio.config.blocks.charges.ender=末影炸药
 
 
 enchantment.enderio.soulbound=灵魂绑定
-description.enchantment.enderio.soulbound=使物品免于死亡掉落丨注意：多数墓碑模组非常愚蠢导致该附魔无法正常工作！
+description.enchantment.enderio.soulbound=使物品免于死亡掉落丨注意：多数墓碑模组非常愚蠢导致该魔咒无法正常工作！
 enchantment.enderio.witherarrow=凋亡
 description.enchantment.enderio.witherarrow=给予目标凋零效果丨适用于弓
 enchantment.enderio.witherweapon=腐烂
 description.enchantment.enderio.witherweapon=给予目标凋零效果丨适用于近战武器
 enchantment.enderio.repellent=驱散传送
-description.enchantment.enderio.repellent=有可能将攻击者传送走丨越高级的附魔，传送的几率越高、（距离使用者）越远
+description.enchantment.enderio.repellent=有可能将攻击者传送走丨魔咒等级越高，传送的概率越大、（距离使用者）越远
 enchantment.enderio.shimmer=微光
 description.enchantment.enderio.shimmer=给物品材质加上附魔光效。丨仅此而已。丨真的。丨没别的用处了。丨对，这没啥用。丨我知道。
 
@@ -1919,7 +1919,7 @@ material.end_steel.prefix=末影钢 %s
 material.construction_alloy.prefix=铁合金 %s
 
 modifier.enderport.name=传送
-modifier.enderport.desc=§o别挡我的路！§r\n有几率将实体传送走。
+modifier.enderport.desc=§o别挡我的路！§r\n有概率将实体传送走。
 
 modifier.enderpickup.name=存入
 modifier.enderpickup.desc=§o我的，都是我的！§r\n将挖掘的物品直接传送到你的物品栏。
@@ -2463,7 +2463,7 @@ tile.block_lava_generator.tooltip.detailed.line3=可以通过在其周围放置
 enderio.gui.lavagen.heat=热量
 
 tile.block_niard.name=The Niard
-tile.block_niard.tooltip.detailed.line1=倒出液体到世界
+tile.block_niard.tooltip.detailed.line1=倒出流体到世界
 tile.block_niard.tooltip.detailed.line2=我们正在寻找一个更好的名字。在 Discord 提出建议。获胜者的名字会显示在此工具提示中。
 
 
@@ -2486,7 +2486,7 @@ enderio.loot.capacitor.wet=蒸煮的 %s
 enderio.loot.capacitor.kaboom=爆裂的 %s
 enderio.loot.capacitor.fatman=原子的 %s
 
-enderio.jei.sagmill.outputchance=副产物几率：{0,choice,0#'<1'|0<{0,number}}%
+enderio.jei.sagmill.outputchance=副产物概率：{0,choice,0#'<1'|0<{0,number}}%
 enderio.jei.sagmill.outputchance.ball=%s（随磨珠改变）
 enderio.jei.sagmill.nomains=副产物已被禁用；100
 enderio.jei.combustion_generator.range.line1=取决于电容和发电机型号
@@ -2498,7 +2498,7 @@ enderio.jei.stirling_generator.range.line2=电容和发电机型号。
 enderio.jei.stirling_generator.notSimple.line1=这种燃料不可用于
 enderio.jei.stirling_generator.notSimple.line2=简易斯特林发电机
 enderio.jei.grinding_ball.main.line1=双倍所有产出的概率
-enderio.jei.grinding_ball.bonus.line1=提升副产物出现的概率，但不会超过 100%
+enderio.jei.grinding_ball.bonus.line1=提升副产物出现的概率，但不会超过 100%%
 enderio.jei.grinding_ball.bonus.line2=计算公式：原概率 * 磨珠概率加成。
 enderio.jei.grinding_ball.power.line1=影响每次工作所需的能量，会改变机器的工作速率
 enderio.jei.recipe=配方：“%s”
@@ -2569,7 +2569,7 @@ enderio.advancement.sagmill.1_sagmill_get.desc=制作一个简易 SAG 磨粉机
 enderio.advancement.sagmill.2_sagmill_flowers.name=摧毁美丽的东西
 enderio.advancement.sagmill.2_sagmill_flowers.desc=研磨一些植物
 
-enderio.advancement.sagmill.3_sagmill_bushes.name=对死亡有益
+enderio.advancement.sagmill.3_sagmill_bushes.name=死得其所
 enderio.advancement.sagmill.3_sagmill_bushes.desc=研磨一些枯死的灌木
 
 enderio.advancement.sagmill.4_brown.name=谁需要丛林？
@@ -2584,10 +2584,10 @@ enderio.advancement.sagmill.6_coal.desc=研磨一些煤炭
 enderio.advancement.sagmill.7_black.name=谁需要鱿鱼？
 enderio.advancement.sagmill.7_black.desc=用煤粉和动物制品合成染料
 
-enderio.advancement.sagmill.8_blue.name=钻石迷情
+enderio.advancement.sagmill.8_blue.name=宝石迷阵
 enderio.advancement.sagmill.8_blue.desc=研磨一些青金石
 
-enderio.advancement.sagmill.9_white.name=钻石迷情 II
+enderio.advancement.sagmill.9_white.name=宝石迷阵 II
 enderio.advancement.sagmill.9_white.desc=研磨一些石英
 
 enderio.advancement.sagmill.a_powder_coating.name=经典色彩

projects/1.12.2/assets/advanced-rocketry/advancedrocketry/lang/en_us.lang

@@ -40,9 +40,12 @@ tile.observatory.name=Observatory
 tile.satelliteBuilder.name=Satellite Builder
 tile.rocket.name=Monopropellant Rocket Engine
 tile.bipropellantrocket.name=Bipropellant Rocket Engine
+tile.nuclearrocket.name=Nuclear Thermal Rocket Engine
 tile.fuelTank.name=Monopropellant Fuel Tank
 tile.bipropellantfueltank.name=Bipropellant Fuel Tank
 tile.oxidizerfueltank.name=Oxidizer Fuel Tank
+tile.nuclearfueltank.name=Nuclear Thermal Working Fluid Tank
+tile.nuclearcore.name=Nuclear Thermal Fission Core
 tile.monitoringstation.name=Rocket Monitoring Station
 tile.satelliteMonitor.name=Satellite Terminal
 tile.lightwoodlog.name=Lightwood Wood
@@ -87,7 +90,6 @@ tile.sapphire.name=Blue Crystal Block
 tile.citrine.name=Yellow Crystal Block
 tile.wulfentite.name=Orange Crystal Block
 tile.amethyst.name=Violet Crystal Block
-tile.orientationControl.name=Orientation Controller
 tile.gravityControl.name=Station Gravity Controller
 tile.drill.name=Drill
 tile.dataPipe.name=Data Cable(Deprecated)
@@ -133,10 +135,6 @@ tile.landingfloat.name=Landing Float
 tile.solararray.name=Solar Array
 tile.solararraypanel.name=Solar Array Panel
 
-tile.Dilithium.name=Dilithium Ore
-
-tile.coil.dilithium.name=Dilithium Coil
-
 item.lens.0.name=Basic Lens
 item.wafer.0.name=Silicon Wafer
 item.circuitplate.0.name=Basic Circuit Plate
@@ -162,8 +160,6 @@ item.satellitePrimaryFunction.5.name=Biome Changer
 item.satelliteIdChip.name=Satellite Id Chip
 item.planetIdChip.name=Planet Id Chip
 item.asteroidChip.name=Asteroid Chip
-item.battery.0.name=Small Battery
-item.battery.1.name=2x Small Battery
 item.miscpart.0.name=User Interface
 item.miscpart.1.name=Carbon Brick
 item.station.name=Space Station Container
@@ -182,32 +178,27 @@ item.itemUpgrade.1.name=Flight Speed Control Upgrade
 item.itemUpgrade.2.name=Bionic Leg Upgrade
 item.itemUpgrade.3.name=Padded Landing Boots
 item.itemUpgrade.4.name=Anti-Fog Visor
+item.itemUpgrade.5.name=Earthbright Visor
 item.atmAnalyser.name=Atmosphere Analyzer
 item.biomeChanger.name=Biome Changer Remote
 item.basicLaserGun.name=Basic Laser Gun
 item.beaconFinder.name=Beacon Finder
 item.thermite.name=Thermite
-item.hovercraft.name=HoverCraft
-item.hovercraft.tooltip=Long lasting dilithium powersource.  It'll probably outlive you.
+item.hovercraft.name=Hovercraft
+item.hovercraft.tooltip=Long lasting dilithium power source.  It'll probably outlive you.
 
-item.jetPack.name=Jet Pack
+item.jetPack.name=Suit Jetpack
 item.pressureTank.0.name=Low Pressure Tank
 item.pressureTank.1.name=Pressure Tank
 item.pressureTank.2.name=High Pressure Tank
 item.pressureTank.3.name=Super High Pressure Tank
 item.elevatorChip.name=Space Elevator Chip
 
-material.Dilithium.name=Dilithium
-material.TitaniumAluminide.name=Titanium Aluminide
-material.TitaniumIridium.name=Titanium Iridium Alloy
-
-container.crystallizer=Crystallizer
-container.cuttingmachine=Cutting Machine
-container.precisionassemblingmachine=Precision Assembling Machine
-container.observatory=Observatory
 container.satellite=Satellite Bay
 container.monitoringstation=Monitoring Station
-container.satelliteMonitor=Satellite Terminal
+
+material.TitaniumAluminide.name=Titanium Aluminide
+material.TitaniumIridium.name=Titanium Iridium Alloy
 
 enchantment.spaceBreathing=Airtight Seal
 
@@ -229,41 +220,41 @@ mission.asteroidmining.name=Asteroid Mining
 mission.gascollection.name=Gas Collection
 
 error.rocket.cannotGetThere=Destination Unreachable
-error.rocket.destinationNotExist=Cannot launch: destination does not exist
-error.rocket.notSameSystem=Cannot launch: destination is not in the same planet system
+error.rocket.destinationNotExist=Cannot launch: Destination does not exist
+error.rocket.notSameSystem=Cannot launch: Destination is not in the same planet system
 
-achievement.holographic=Holographic
-achievement.holographic.desc=Craft a Holo-Projector
-achievement.flattening=Flattening
-achievement.flattening.desc=Make a Small Plate Presser
-achievement.feelTheHeat=Feel The Heat!
-achievement.feelTheHeat.desc=Craft an Arc Furnace
-achievement.electrifying=Electrifying!
-achievement.electrifying.desc=Craft an Electrolyser
-achievement.spinDoctor=Spin Doctor
-achievement.spinDoctor.desc=Craft a Lathe
-achievement.rollin=Rollin'
-achievement.rollin.desc=Craft a Rolling Machine
-achievement.crystalline=Crystalline
-achievement.crystalline.desc=Craft a Crystallizer
-achievement.warp=Warp
-achievement.warp.desc=Build a warp core
-achievement.moonLanding=Moon Landing!
-achievement.moonLanding.desc=Land on the moon
-achievement.oneSmallStep=One Small Step...
-achievement.oneSmallStep.desc=Be the first to land on the moon!
-achievement.weReallyWentToTheMoon=We Really Went to the moon!
-achievement.weReallyWentToTheMoon.desc=Find the Apollo 11 landing site on the Moon
-achievement.dilithium=Dilithium
-achievement.dilithium.desc=Find Dilithium ore
-achievement.givingItAllShesGot=Giving it all she's got!
-achievement.givingItAllShesGot.desc=Fly in a Warp Capable ship
-achievement.flightOfThePhoenix=Flight of the Phoenix
-achievement.flightOfThePhoenix.desc=Build and fly the first warp capable ship
-achievement.beerOnTheSun=Adult Beverages on the sun
-achievement.beerOnTheSun.desc=You'll need more TNT to get to orbit
-achievement.suitedUp=Suited Up
-achievement.suitedUp.desc=Wear a full spacesuit
+advancement.holographic=Holographic
+advancement.holographic.desc=Craft a Holo-Projector
+advancement.flattening=Flattening
+advancement.flattening.desc=Make a Small Plate Presser
+advancement.feelTheHeat=Feel The Heat!
+advancement.feelTheHeat.desc=Craft an Arc Furnace
+advancement.electrifying=Electrifying!
+advancement.electrifying.desc=Craft an Electrolyser
+advancement.spinDoctor=Spin Doctor
+advancement.spinDoctor.desc=Craft a Lathe
+advancement.rollin=Rollin'
+advancement.rollin.desc=Craft a Rolling Machine
+advancement.crystalline=Crystalline
+advancement.crystalline.desc=Craft a Crystallizer
+advancement.warp=Warp
+advancement.warp.desc=Build a warp core
+advancement.moonLanding=Moon Landing!
+advancement.moonLanding.desc=Land on the moon
+advancement.oneSmallStep=One Small Step...
+advancement.oneSmallStep.desc=Be the first to land on the moon!
+advancement.weReallyWentToTheMoon=We Really Went to the moon!
+advancement.weReallyWentToTheMoon.desc=Find the Apollo 11 landing site on the Moon
+advancement.dilithium=Dilithium
+advancement.dilithium.desc=Find Dilithium ore
+advancement.givingItAllShesGot=Giving it all she's got!
+advancement.givingItAllShesGot.desc=Fly in a Warp Capable ship
+advancement.flightOfThePhoenix=Flight of the Phoenix
+advancement.flightOfThePhoenix.desc=Build and fly the first warp capable ship
+advancement.beerOnTheSun=Adult Beverages on the sun
+advancement.beerOnTheSun.desc=You'll need more TNT to get to orbit
+advancement.suitedUp=Suited Up
+advancement.suitedUp.desc=Wear a full spacesuit
 
 
 
@@ -280,7 +271,6 @@ enchantment.advancedrocketry.spacebreathing.desc=Allows the piece of armor to fo
 
 machine.tooltip.smallplatepress=Requires obsidian two blocks below to function
 
-msg.crystalliser.gravityTooHigh=Gravity is not low enough!
 msg.crystalliser.gravityTooHigh=Gravity is not low enough!
 msg.observetory.scan.tooltip=Scans for new asteroids, consumes 100 distance data
 msg.observetory.scan.button=Scan!
@@ -333,7 +323,7 @@ msg.rocketLoader.allowredstoneinput=Allow redstone input
 msg.rocketLoader.allowredstoneoutput=Allow redstone output
 msg.rocketLoader.none=None
 msg.rocketLoader.link=You program the linker with the rocket loader at: 
-msg.microwaverec.notgenerating=Generating 0 RF/t
+msg.microwaverec.notgenerating=Generating 0 FE/t
 msg.microwaverec.generating=Generating
 msg.abdp.compositionresearch=Composition Research
 msg.abdp.distanceresearch=Distance Research
@@ -395,7 +385,7 @@ msg.warpmon.datareq=100 of each datatype required
 msg.warpmon.artifact=Artifacts
 msg.rocketbuilder.success=Clear for liftoff!
 msg.rocketbuilder.nofuel=Not enough fuel capacity!
-msg.rocketbuilder.noseat=Missing Seat or satellite!
+msg.rocketbuilder.noseat=Missing seat or satellite bay!
 msg.rocketbuilder.noengines=You do not have enough thrust!
 msg.rocketbuilder.noguidance=Missing Guidance Computer
 msg.rocketbuilder.unscanned=Rocket unscanned
@@ -413,6 +403,7 @@ msg.rocketbuilder.fuel=Fuel
 msg.rocketbuilder.acc=Acc
 msg.rocketbuilder.build=Build
 msg.rocketbuilder.scan=Scan
+msg.rocketbuild.combinedthrust=Fuel types cannot be combined!
 msg.solar.collectingEnergy=Collecting Energy:
 msg.solar.cannotcollectEnergy=Unable to collect Energy
 msg.asteroidChip.asteroid=Asteroid
@@ -466,13 +457,11 @@ msg.entity.rocket.rcs=RCS Mode
 msg.entity.rocket.none=None Selected
 msg.wirelessTransciever.extract=extract
 
-msg.entityDeployedRocket.notGasGiant=No Gas Here
-msg.powerunit.rfpertick=RF/t
+msg.powerunit.rfpertick=FE/t
 msg.linker.error.firstMachine=This must be the first machine to link!
 msg.linker.program=Coordinates programmed into Linker
 msg.linker.success=Linked Sucessfully
 msg.notenoughpower=Not Enough power!
-msg.noOxygen=Warning: No Oxygen detected!
 msg.empty=Empty
 msg.yes=yes
 msg.no=no
@@ -483,9 +472,10 @@ msg.programfail=Programming Failed
 msg.modules=modules
 msg.na=N/A
 msg.entityDeployedRocket.notGasGiant=No Gas Here
-msg.tooHot=Warning: It's too hot!
-msg.tooDense=Warning: Air Pressure too high!
-msg.muchTooDense=Warning: air pressure critically dense, air unbreathable!
+msg.noOxygen=Warning: Atmosphere lacks oxygen!
+msg.tooHot=Warning: Atmosphere too hot!
+msg.tooDense=Warning: Atmosphere pressure too high!
+msg.muchTooDense=Warning: Atmosphere pressure critically dense!
 
 msg.chat.nostation1=You wake up on the space station with a lingering feeling that your far-reaching spacewalk was frowned upon by some elder fox deity, and that it would be foolish to attempt so again and to expect different results
 msg.chat.nostation2=Maybe you should think before overstepping clearly logical and absolute boundaries again then deciding it was a good idea and not your fault if things go wrong