From 643aaf16bbf19d5da4c6f08e1fdd3cd0ed921e3b Mon Sep 17 00:00:00 2001 From: iouter <62897714+iouter@users.noreply.github.com> Date: Tue, 2 Jan 2024 16:51:30 +0800 Subject: [PATCH 1/3] Update publish_project.yml --- .github/workflows/publish_project.yml | 70 +++++++++++++-------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/.github/workflows/publish_project.yml b/.github/workflows/publish_project.yml index 2172ac6806e..59b55d0a439 100644 --- a/.github/workflows/publish_project.yml +++ b/.github/workflows/publish_project.yml @@ -1,58 +1,54 @@ -# Publishes the project to GitHub Releases, CurseForge, and Modrinth +# Publishes built jars to distribution platforms name: Publish Project -on: - push: - tags: - - 'v[0-9]+.[0-9]+.[0-9]+' # any SemVer tag, e.g. v1.2.3 +on: workflow_dispatch env: # link to the changelog with a format code for the version - CHANGELOG_LOCATION: "Changelog is available [here](https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }})" + CHANGELOG_LOCATION: "Changelog is available [here](https://github.com/${{github.repository}}/releases/tag/${{github.ref_name}})" # type of release - RELEASE_TYPE: 'beta' - -concurrency: - group: publish-${{ github.head_ref || github.ref }} - cancel-in-progress: true + RELEASE_TYPE: "beta" jobs: - publish: - name: Publish + Publish: runs-on: ubuntu-latest - permissions: + permissions: contents: write # needed to create GitHub releases steps: - name: Checkout Repository - uses: actions/checkout@v4 - - - name: Setup Build - uses: ./.github/actions/build_setup - + uses: actions/checkout@v3 + + - name: Check for Duplicate Tags + run: | + if git rev-parse -q --verify "refs/tags/${{ github.ref }}" >/dev/null; then + echo "Tag already exists. A version bump is required." + exit 1 + fi + + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + java-version: '17' + - name: Build Project - run: ./gradlew build --warning-mode all --build-cache - + uses: gradle/gradle-build-action@v2 + with: + arguments: 'build --build-cache --daemon' # use the daemon here so the rest of the process is faster + generate-job-summary: false + gradle-home-cache-includes: | + caches + jdks + notifications + wrapper + - name: Publish to GitHub uses: softprops/action-gh-release@v1 with: files: "build/libs/*.jar" generate_release_notes: true fail_on_unmatched_files: true - - - name: Publish to Curseforge - env: - CURSEFORGE_API_KEY: "${{ secrets.CURSEFORGE_API_KEY }}" - CURSEFORGE_PROJECT_ID: "${{ secrets.CURSEFORGE_PROJECT_ID }}" - CHANGELOG_LOCATION: "${{ env.CHANGELOG_LOCATION }}" - RELEASE_TYPE: "${{ env.RELEASE_TYPE }}" - run: ./gradlew curseforge --warning-mode all --build-cache - - - name: Publish to Modrinth - env: - MODRINTH_API_KEY: "${{ secrets.MODRINTH_API_KEY }}" - MODRINTH_PROJECT_ID: "${{ secrets.MODRINTH_PROJECT_ID }}" - CHANGELOG_LOCATION: "${{ env.CHANGELOG_LOCATION }}" - RELEASE_TYPE: "${{ env.RELEASE_TYPE }}" - run: ./gradlew modrinth --warning-mode all --build-cache + tag_name: tags + name: names From 26bfcb2ad538ecb511e5d50882c7ba20a2476058 Mon Sep 17 00:00:00 2001 From: iouter <62897714+iouter@users.noreply.github.com> Date: Wed, 3 Jan 2024 19:09:22 +0800 Subject: [PATCH 2/3] Update zh_cn.lang --- .../resources/assets/gregtech/lang/zh_cn.lang | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/main/resources/assets/gregtech/lang/zh_cn.lang b/src/main/resources/assets/gregtech/lang/zh_cn.lang index 88906474bcf..8fa4c506934 100644 --- a/src/main/resources/assets/gregtech/lang/zh_cn.lang +++ b/src/main/resources/assets/gregtech/lang/zh_cn.lang @@ -531,7 +531,7 @@ metaitem.tool.datamodule.name=数据模块 metaitem.tool.datamodule.tooltip=超复杂数据存储/n§c只能用数据库读取 metaitem.circuit.integrated.name=编程电路 metaitem.circuit.integrated.tooltip=右击以打开配置界面/n/n手持并潜行右击带有编程电路槽位的机器可应用相应配置。/n -metaitem.circuit.integrated.gui=编程电路配置 +metaitem.circuit.integrated.gui=电路配置 metaitem.circuit.integrated.jei_description=JEI将仅显示匹配当前编程电路配置的配方。\n\n在编程电路配置界面中调整配置以查看对应配方。 item.glass.lens=玻璃透镜（白色） @@ -1175,7 +1175,7 @@ cover.filter.blacklist.disabled=白名单 cover.filter.blacklist.enabled=黑名单 cover.ore_dictionary_filter.title=矿物词典过滤 -cover.ore_dictionary_filter.info=§b接受复杂表达式/n§6a & b§r = 且/n§6a | b§r = 或/n§6a ^ b§r = 异或/n§6! abc§r = 非/n§6( abc )§r 表示组别/n§6*§r 表示通配（也即零或多个字符）/n§6?§r 表示任意一个字符/n§6()§r 匹配空条目（包括不带矿物词典的物品）/n在表达式开头添加 §6$c§r 可严格区分大小写/n§b使用范例：/n§6dust*Gold | (plate* & !*Double*)/n匹配双层板以外的板与包括小撮、小堆在内的所有金粉 +cover.ore_dictionary_filter.info=§b接受复杂表达式/n§6a & b§r = 且/n§6a | b§r = 或/n§6a ^ b§r = 异或/n§6! abc§r = 非/n§6( abc )§r 表示组别/n§6*§r 表示通配（也即零或多个字符）/n§6?§r 表示任意一个字符/n§6()§r 匹配空条目（包括不带矿物词典的物品）/n在表达式开头添加 §b使用范例：/n§6dust*Gold | (plate* & !*Double*)/n匹配双层板以外的板与包括小撮、小堆在内的所有金粉 cover.ore_dictionary_filter.test_slot.info=放入一件物品以测试是否匹配过滤表达式 cover.ore_dictionary_filter.test_slot.matches=§a* %s cover.ore_dictionary_filter.test_slot.matches_not=§c* %s @@ -1186,6 +1186,10 @@ cover.ore_dictionary_filter.status.err_warn=§c%s个错误、%s个警告 cover.ore_dictionary_filter.status.warn=§7%s个警告 cover.ore_dictionary_filter.status.no_issues=§a无问题 cover.ore_dictionary_filter.status.explain=矿物过滤说明： +cover.ore_dictionary_filter.button.case_sensitive.disabled=匹配大小写 +cover.ore_dictionary_filter.button.case_sensitive.enabled=忽略大小写 +cover.ore_dictionary_filter.button.match_all.disabled=匹配物品的任一矿词条目 +cover.ore_dictionary_filter.button.match_all.enabled=匹配物品的所有矿词条目 cover.ore_dictionary_filter.preview.next=...接着是 cover.ore_dictionary_filter.preview.match='%s' @@ -1300,11 +1304,6 @@ cover.fluid_regulator.transfer_mode.description=§e任意传输§r - 在此模 cover.fluid_regulator.supply_exact=精确补给：%s cover.fluid_regulator.keep_exact=保持补给：%s -cover.machine_controller.title=机器控制设定 -cover.machine_controller.normal=普通 -cover.machine_controller.inverted=反相 -cover.machine_controller.inverted.description=§e普通§r - 该模式下的覆盖板需要比设定强度小的红石信号来触发/n§e反相§r - 该模式下的覆盖板需要比设定强度大的红石信号来触发 -cover.machine_controller.redstone=最小红石信号强度：%,d cover.machine_controller.mode.machine=控制目标：机器 cover.machine_controller.mode.cover_up=控制目标：覆盖板（顶面） cover.machine_controller.mode.cover_down=控制目标：覆盖板（底面） @@ -1312,6 +1311,12 @@ cover.machine_controller.mode.cover_south=控制目标：覆盖板（南面） cover.machine_controller.mode.cover_north=控制目标：覆盖板（北面） cover.machine_controller.mode.cover_east=控制目标：覆盖板（东面） cover.machine_controller.mode.cover_west=控制目标：覆盖板（西面） +cover.machine_controller.this_cover=§c此覆盖板 +cover.machine_controller.cover_not_controllable=§c不可控制的覆盖板 +cover.machine_controller.machine_not_controllable=§c不可控制的机器 +cover.machine_controller.control=控制： +cover.machine_controller.enable_with_redstone=接收红石信号时开启 +cover.machine_controller.disable_with_redstone=接收红石信号时关闭 cover.ender_fluid_link.title=末影流体连接 cover.ender_fluid_link.iomode.enabled=已启用I/O @@ -1356,9 +1361,9 @@ item.material.oreprefix.oreBasalt=玄武岩%s矿石 item.material.oreprefix.oreSand=沙子%s矿石 item.material.oreprefix.oreRedSand=红沙%s矿石 item.material.oreprefix.oreNetherrack=地狱岩%s矿石 -item.material.oreprefix.oreNether=下界%s矿石 +item.material.oreprefix.oreNether=地狱岩%s矿石 item.material.oreprefix.oreEndstone=末地石%s矿石 -item.material.oreprefix.oreEnd=末地%s矿石 +item.material.oreprefix.oreEnd=末地石%s矿石 item.material.oreprefix.ore=%s矿石 item.material.oreprefix.oreGranite=花岗岩%s矿石 item.material.oreprefix.oreDiorite=闪长岩%s矿石 @@ -4146,7 +4151,7 @@ gregtech.machine.transformer.adjustable.opv.name=过载压高能变压器（§9O gregtech.machine.diode.message=电流吞吐上限：%s gregtech.machine.diode.tooltip_tool_usage=手持软锤右击以调节电流。 gregtech.machine.diode.tooltip_general=使能量作单向传输并限制电流 -gregtech.machine.diode.tooltip_starts_at=默认为§f1A§7，使用软锤来轮换电流设定 +gregtech.machine.diode.tooltip_starts_at=默认允许§f1A§r电流通行，使用软锤切换。 gregtech.machine.diode.ulv.name=超低压二极管（§8ULV§r） gregtech.machine.diode.lv.name=低压二极管（§7LV§r） @@ -4400,7 +4405,7 @@ gregtech.machine.world_accelerator.zpm.name=精英世界加速器 III gregtech.machine.world_accelerator.zpm.tooltip=“时间之§m瓶§r”§7方块 gregtech.machine.world_accelerator.uv.name=终极世界加速器 gregtech.machine.world_accelerator.uv.tooltip=时间扭曲者 -gregtech.machine.world_accelerator.description=使用§f螺丝刀§7在§f方块实体§7或§f随机刻§7模式中切换。 +gregtech.machine.world_accelerator.description=使用§f螺丝刀§7在§f方块实体§r或§f随机刻§7模式中切换。 gregtech.machine.world_accelerator.power_usage=§7在随机刻模式下最多使用§f%dA，§7在方块实体模式下最多使用§f%dA 。 gregtech.machine.world_accelerator.acceleration=§d加速倍率: §f%dx gregtech.machine.world_accelerator.working_area=§b作用范围： @@ -4709,7 +4714,7 @@ gregtech.machine.large_chemical_reactor.name=大型化学反应釜 gregtech.machine.large_combustion_engine.name=大型内燃引擎 gregtech.machine.extreme_combustion_engine.name=极限内燃引擎 gregtech.machine.large_combustion_engine.tooltip.boost_regular=提供§f20 L/s§7的氧气，并消耗§f双倍§7燃料以产生高达§f%s§7 EU/t的功率。 -gregtech.machine.large_combustion_engine.tooltip.boost_extreme=提供§f80 L/s§7的液氧，并消耗§f双倍§7燃料以产生高达§f%s§7 EU/t的功率。 +gregtech.machine.large_combustion_engine.tooltip.boost_extreme=提供§f80L/s§7的液态氧，并消耗§f双倍§7燃料以产生高达§f%s§7EU/t的功率。 gregtech.machine.large_turbine.steam.name=大型蒸汽涡轮 gregtech.machine.large_turbine.gas.name=大型燃气涡轮 @@ -4740,7 +4745,7 @@ gregtech.machine.large_miner.ev.name=基础采矿场 gregtech.machine.large_miner.iv.name=进阶采矿场 gregtech.machine.large_miner.luv.name=进阶采矿场 II gregtech.machine.miner.multi.modes=具有精准采集模式与区块对齐模式。 -gregtech.machine.miner.multi.production=粉碎矿石的产出量为§f研磨机§7的§f3倍§7。 +gregtech.machine.miner.multi.production=产出§f研磨机§7§f3x§7倍的粉碎矿石。 gregtech.machine.miner.fluid_usage=每tick消耗§f%,d L§7的§f%s§7，超频时翻倍。 gregtech.machine.miner.multi.description=一台工作范围极广的多方块采矿机，能够提供巨量矿石。 gregtech.machine.miner.multi.needsfluid=钻井液不足！ @@ -4933,7 +4938,6 @@ gregtech.machine.item_bus.export.uhv.name=§4UHV§r输出总线 gregtech.bus.collapse_true=已启用物品堆叠自动合并 gregtech.bus.collapse_false=已禁用物品堆叠自动合并 -gregtech.bus.collapse.error=总线位于已成型的多方块结构后方可进行该操作 gregtech.machine.fluid_hatch.import.tooltip=为多方块结构输入流体 @@ -5270,7 +5274,7 @@ gregtech.universal.tooltip.item_stored=§d内含物品：§f%2$,d + %3$,d 个%1$ gregtech.universal.tooltip.item_transfer_rate=§b传输速率：§f%,d件物品/s gregtech.universal.tooltip.item_transfer_rate_stacks=§b传输速率：§f%,d组物品/s gregtech.universal.tooltip.fluid_storage_capacity=§9流体容量：§f%,d L -gregtech.universal.tooltip.fluid_storage_capacity_mult=§9流体容量：共§f%d§7个流体槽，每个§f%dL§7 +gregtech.universal.tooltip.fluid_storage_capacity_mult=§9流体容量：§r共§f%d§7个流体槽，每个§f%dL§7 gregtech.universal.tooltip.fluid_stored=§d内含流体：§f%2$,d L %1$s gregtech.universal.tooltip.fluid_transfer_rate=§b传输速率：§f%,d L/t gregtech.universal.tooltip.parallel=§d最大并行：§f%d @@ -5366,9 +5370,12 @@ gregtech.gui.fluid_auto_output.tooltip.enabled=流体自动输出已启用 gregtech.gui.fluid_auto_output.tooltip.disabled=流体自动输出已禁用 gregtech.gui.item_auto_output.tooltip.enabled=物品自动输出已启用 gregtech.gui.item_auto_output.tooltip.disabled=物品自动输出已禁用 +gregtech.gui.item_auto_collapse.tooltip.enabled=物品堆叠自动合并已启用 +gregtech.gui.item_auto_collapse.tooltip.disabled=物品堆叠自动合并已禁用 gregtech.gui.charger_slot.tooltip=§f充电槽§r/n§7从%s电池中取电§7/n§7也可为%s工具或电池充电 -gregtech.gui.configurator_slot.tooltip=§f编程电路槽§r/n§a配置值：§f%d§7/n/n§7左击/右击/滚轮可浏览循环列表/n§7Shift+右键单击以清除 +gregtech.gui.configurator_slot.tooltip=§f编程电路槽§r\n§a配置值：§f%d§7\n\n§7左击/右击/滚轮可循环浏览列表\n§7Shift+左键单击以打开选择GUI\n§7Shift+右键单击以清除 gregtech.gui.configurator_slot.no_value=空 +gregtech.gui.configurator_slot.unavailable.tooltip=编程电路槽位无法使用 gregtech.gui.fluid_lock.tooltip.enabled=流体锁定已启用 gregtech.gui.fluid_lock.tooltip.disabled=流体锁定已禁用 gregtech.gui.fluid_voiding.tooltip.enabled=过量流体销毁已启用 @@ -5555,7 +5562,7 @@ gregtech.multiblock.pattern.error.batteries=§c必须至少有一个不是空电 gregtech.multiblock.pattern.error.filters=§c必须使用同种过滤器§r gregtech.multiblock.pattern.clear_amount_1=§6前方必须有1x1x1大小的空间§r gregtech.multiblock.pattern.clear_amount_3=§6前方必须有3x3x1大小的空间§r -gregtech.multiblock.pattern.single=§6仅可使用该种方块§r +gregtech.multiblock.pattern.single=§6仅可使用该种方块类型§r gregtech.multiblock.pattern.location_end=§c最末端§r gregtech.multiblock.pattern.replaceable_air=可为空气 From 60e210143e60f9678c5bbe98221f320b89ce0df5 Mon Sep 17 00:00:00 2001 From: iouter <3155186831@qq.com> Date: Wed, 3 Jan 2024 19:17:15 +0800 Subject: [PATCH 3/3] Revert "Update publish_project.yml" This reverts commit 643aaf16bbf19d5da4c6f08e1fdd3cd0ed921e3b. --- .github/workflows/publish_project.yml | 70 ++++++++++++++------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/.github/workflows/publish_project.yml b/.github/workflows/publish_project.yml index 59b55d0a439..2172ac6806e 100644 --- a/.github/workflows/publish_project.yml +++ b/.github/workflows/publish_project.yml @@ -1,54 +1,58 @@ -# Publishes built jars to distribution platforms +# Publishes the project to GitHub Releases, CurseForge, and Modrinth name: Publish Project -on: workflow_dispatch +on: + push: + tags: + - 'v[0-9]+.[0-9]+.[0-9]+' # any SemVer tag, e.g. v1.2.3 env: # link to the changelog with a format code for the version - CHANGELOG_LOCATION: "Changelog is available [here](https://github.com/${{github.repository}}/releases/tag/${{github.ref_name}})" + CHANGELOG_LOCATION: "Changelog is available [here](https://github.com/${{ github.repository }}/releases/tag/${{ github.ref_name }})" # type of release - RELEASE_TYPE: "beta" + RELEASE_TYPE: 'beta' + +concurrency: + group: publish-${{ github.head_ref || github.ref }} + cancel-in-progress: true jobs: - Publish: + publish: + name: Publish runs-on: ubuntu-latest - permissions: + permissions: contents: write # needed to create GitHub releases steps: - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Check for Duplicate Tags - run: | - if git rev-parse -q --verify "refs/tags/${{ github.ref }}" >/dev/null; then - echo "Tag already exists. A version bump is required." - exit 1 - fi - - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: '17' - + uses: actions/checkout@v4 + + - name: Setup Build + uses: ./.github/actions/build_setup + - name: Build Project - uses: gradle/gradle-build-action@v2 - with: - arguments: 'build --build-cache --daemon' # use the daemon here so the rest of the process is faster - generate-job-summary: false - gradle-home-cache-includes: | - caches - jdks - notifications - wrapper - + run: ./gradlew build --warning-mode all --build-cache + - name: Publish to GitHub uses: softprops/action-gh-release@v1 with: files: "build/libs/*.jar" generate_release_notes: true fail_on_unmatched_files: true - tag_name: tags - name: names + + - name: Publish to Curseforge + env: + CURSEFORGE_API_KEY: "${{ secrets.CURSEFORGE_API_KEY }}" + CURSEFORGE_PROJECT_ID: "${{ secrets.CURSEFORGE_PROJECT_ID }}" + CHANGELOG_LOCATION: "${{ env.CHANGELOG_LOCATION }}" + RELEASE_TYPE: "${{ env.RELEASE_TYPE }}" + run: ./gradlew curseforge --warning-mode all --build-cache + + - name: Publish to Modrinth + env: + MODRINTH_API_KEY: "${{ secrets.MODRINTH_API_KEY }}" + MODRINTH_PROJECT_ID: "${{ secrets.MODRINTH_PROJECT_ID }}" + CHANGELOG_LOCATION: "${{ env.CHANGELOG_LOCATION }}" + RELEASE_TYPE: "${{ env.RELEASE_TYPE }}" + run: ./gradlew modrinth --warning-mode all --build-cache