Merge branch 'CFPAOrg:main' into main-dyenamicsandfriends

Author: ChuijkYahus

.github/boring-cyborg.yml

@@ -19,19 +19,27 @@ labelPRBasedOnFilePath:
     1.20.x:
         - "projects/1.20/**"
         - "projects/1.20-fabric/**"
+
+    1.21.x:
+        - "projects/1.21/**"
+        - "projects/1.21-fabric/**"
 
     Forge:
         - "projects/1.12.2/**"
         - "projects/1.16/**"
         - "projects/1.18/**"
         - "projects/1.19/**"
+
+    (Neo)Forge:
         - "projects/1.20/**"
+        - "projects/1.21/**"
 
     Fabric:
         - "projects/1.16-fabric/**"
         - "projects/1.18-fabric/**"
       # - "projects/1.19-fabric/**"
         - "projects/1.20-fabric/**"
+        - "projects/1.21-fabric/**"
 
     Patchouli:
         - "projects/**/patchouli_books/**"
@@ -81,8 +89,9 @@ labelerFlags:
 firstPRWelcomeComment: |
     你好贡献者，欢迎贡献本项目。请阅读 CLA Assistant 给出的《贡献者许可协议》并决定是否签署，若不签署，我们将无法接收你的贡献。
     你已成功发送你在 CFPA 仓库的第一个 Pull Request！请在几分钟之后观察 CFPA-Bot 给出的内容，看是否存在报错。
-    **请注意！**如果存在错误，**不要**关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。
+    **请注意！** 如果存在错误，**不要**关闭 Pull Request，几乎所有可能出现的错误都能在不关闭 Pull Request 的情况下解决。如果频繁新建/关闭 Pull Request，你可能遭到封禁。
     确认无误后请耐心等待审阅，并在审阅人提出意见给出答复或修改内容。
+    若要提交多个模组，请新建一个基于 upstream/main 的分支，再向新分支提交其他模组的翻译，并发送 Pull Request。
     如需快速联系，请[加 QQ 群](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=b1iBq79z3h1OtJpEl8gstrhlu_oYlyl6&authKey=LgDPZAJSg2uFKjiMylQkkef9tAfTja8W4rBd5KkN6aSsYKpWKFbSqrM9GY7AoHJ7&noverify=0&group_code=630943368)：630943368
 
 # Comment to be posted to congratulate user on their first merged PR

.github/workflows/packer.yml

@@ -26,7 +26,7 @@ jobs:
       # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
       - name: Cache Packer
         id: cache-packer
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
@@ -53,7 +53,7 @@ jobs:
   #     # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
   #     - name: Cache Uploader
   #       id: cache-uploader
-  #       uses: actions/cache@v3
+  #       uses: actions/cache@v4
   #       with:
   #         key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
   #         path: Uploader.exe
@@ -99,7 +99,7 @@ jobs:
       matrix:
         # 版本列表。将对这里的每个版本判断，按需打包。
         # 如需添加新版本，在这里添加即可。
-        version: [ "1.12.2", "1.16", "1.16-fabric", "1.18", "1.18-fabric", "1.19", "1.20", "1.20-fabric" ]
+        version: [ "1.12.2", "1.16", "1.16-fabric", "1.18", "1.18-fabric", "1.19", "1.20", "1.20-fabric", "1.21", "1.21-fabric" ]
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
@@ -109,8 +109,7 @@ jobs:
       # 由于Github的限制，这里需要重新拉取打包程序。
       - name: Restore Packer
         id: cache-restore
-        # https://github.com/actions/cache/issues/1265#issuecomment-1819612829 `fail-on-cache-miss` for restore action not failing the workflow
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v4
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('source/Packer/**') }}
           path: |
@@ -136,7 +135,7 @@ jobs:
 
       # Artifact 上传内容：每个版本一个压缩包，包含了资源包和md5校验文件
       - name: Upload Artifact for ${{ matrix.version }}
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Minecraft-Mod-Language-Package-${{ matrix.version }}
           path: |
@@ -175,9 +174,14 @@ jobs:
 
       # 还原artifact（资源包）
       - name: Restore Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          path: artifacts/
+          path: artifacts/
+
+      # feat: UTC 20:00~21:00 取消上传（避开远程服务器的4:00-4:10）
+      - name: Fail at inappropriate time
+        run: if [ `date -u +%H` -eq 20 ]; then exit -1; fi
+        shell: bash
 
       - name: Run Uploader
-        run: .\Uploader --host="${{ secrets.SSH_IP }}" --name="${{ secrets.SSH_USER }}" --password="${{ secrets.SSH_PWD }}"
+        run: .\Uploader --host="${{ secrets.SSH_IP }}" --name="${{ secrets.SSH_USER }}" --password="${{ secrets.SSH_PWD }}"

.github/workflows/pr-packer.yml

@@ -8,6 +8,7 @@ on:
       - 'src/**'
       - 'config/packer/**'
       - 'projects/**'
+      - '.github/workflows/pr-packer.yml'
 
 
 
@@ -27,7 +28,7 @@ jobs:
       # actions/cache的逻辑会在job末尾缓存打包程序；如果不命中，就自行构造程序。
       - name: Cache Packer
         id: cache-packer
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
@@ -50,7 +51,7 @@ jobs:
       matrix:
         # 支持版本列表。将对这里的每个版本判断，按需打包。
         # 如需添加新版本，在这里添加即可。
-        version: ["1.12.2", "1.16", "1.16-fabric", "1.18", "1.18-fabric", "1.19", "1.20", "1.20-fabric"]
+        version: ["1.12.2", "1.16", "1.16-fabric", "1.18", "1.18-fabric", "1.19", "1.20", "1.20-fabric", "1.21", "1.21-fabric"]
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
@@ -61,8 +62,7 @@ jobs:
       # 由于Github的限制，这里需要重新拉取打包程序。
       - name: Restore Packer
         id: cache-restore
-        # https://github.com/actions/cache/issues/1265#issuecomment-1819612829 `fail-on-cache-miss` for restore action not failing the workflow
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v4
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
@@ -102,8 +102,8 @@ jobs:
         if: steps.check-changes.outputs.changed == 'true' ||  github.event_name == 'workflow_dispatch'
 
       - name: Upload Artifact for ${{ matrix.version }}
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v4
         with:
           name: Minecraft-Mod-Language-Package-${{ matrix.version }}
           path: Minecraft-Mod-Language-Package-${{ matrix.version }}/*
-        if: steps.check-changes.outputs.changed == 'true' ||  github.event_name == 'workflow_dispatch'
+        if: steps.check-changes.outputs.changed == 'true' ||  github.event_name == 'workflow_dispatch'

.github/workflows/stale.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           days-before-issue-stale: -1
           days-before-issue-close: -1
-          stale-pr-message: "请注意回应审查人的审查意见，若 24 小时内不回应，该 PR 即将被关闭。相关规则见[贡献方针](https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/blob/main/CONTRIBUTING.md#搁置规则)。"
+          stale-pr-message: "请注意回应审阅人的审阅意见，若 24 小时内不回应，该 PR 即将被关闭。相关规则见[贡献方针](https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/blob/main/CONTRIBUTING.md#搁置规则)。"
           close-pr-message: "因你的回应时间超过时限，该 PR 已因搁置而被关闭。如需再次提交可重新打开（Reopen）该 PR，感谢贡献:heart:。相关规则见[贡献方针](https://github.com/CFPAOrg/Minecraft-Mod-Language-Package/blob/main/CONTRIBUTING.md#搁置规则)。"
           days-before-pr-stale: 7
           days-before-pr-close: 1