fetch and merge

.github/workflows/formatter.yml

@@ -1,16 +1,23 @@
 name: Formatter
 
+permissions:
+  pull-requests: write
+  contents: write
+
 on: 
   workflow_dispatch:
   schedule:
     - cron: '0 9 1,15 * *'
+  pull_request:
 
 
 jobs:
   build:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       - name: Build formatter
         run: dotnet publish .\src\Formatter\Formatter.csproj -c Release -o ./ -r win-x64 -p:PublishSingleFile=true
@@ -38,12 +45,23 @@ jobs:
           git add .
           git commit -m "[Formatter]Update file"
         shell: pwsh
+        if: github.event_name != 'pull_request'
+
+      - uses: gr2m/create-or-update-pull-request-action@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          commit-message: "[Formatter]Update file"
+          author: "github-actions[bot] <actions@users.noreply.github.com>"
+          branch: ${{ github.ref }}
+        if: github.event_name == 'pull_request'
 
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: ${{ github.ref }}
+        if: github.event_name != 'pull_request'
       # - name: Push changes
       #   git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
       #   git config --local user.name "github-actions[bot]"

projects/1.12.2/assets/simple-machinery/simplemachinery/lang/zh_cn.lang

@@ -1,10 +1,11 @@
 itemGroup.simple_machinery=简单机器
+itemGroup.simplemachinery.machines=简单机器
 
 # fluid.steam=蒸汽
 
 # item.simplemachinery.cell.name=流体单元
 
 tile.simplemachinery.autoclave.name=热压罐
-tile.simplemachinery.turntable.name=转换台
 tile.simplemachinery.fluid_centrifuge.name=流体离心机
+tile.simplemachinery.turntable.name=转换台
 # tile.simplemachinery.regolith.name=小行星表层土

projects/1.16/assets/chipped/chipped/lang/zh_cn.json

@@ -1057,6 +1057,22 @@
   "block.chipped.gilded_blackstone_4": "镶金黑石",
   "block.chipped.gilded_blackstone_5": "镶金黑石",
   "block.chipped.vine_1": "藤蔓",
+  "block.chipped.vine_2": "藤蔓",
+  "block.chipped.vine_3": "藤蔓",
+  "block.chipped.vine_4": "藤蔓",
+  "block.chipped.vine_5": "藤蔓",
+  "block.chipped.vine_6": "藤蔓",
+  "block.chipped.vine_7": "藤蔓",
+  "block.chipped.vine_8": "藤蔓",
+  "block.chipped.vine_9": "藤蔓",
+  "block.chipped.vine_10": "藤蔓",
+  "block.chipped.vine_11": "藤蔓",
+  "block.chipped.vine_12": "藤蔓",
+  "block.chipped.vine_13": "藤蔓",
+  "block.chipped.vine_14": "藤蔓",
+  "block.chipped.vine_15": "藤蔓",
+  "block.chipped.vine_16": "藤蔓",
+  "block.chipped.vine_17": "藤蔓",
   "block.chipped.white_terracotta_1": "白色陶瓦",
   "block.chipped.white_terracotta_2": "白色陶瓦",
   "block.chipped.white_terracotta_3": "白色陶瓦",
@@ -1897,13 +1913,6 @@
   "block.chipped.basalt_18": "玄武岩",
   "block.chipped.basalt_19": "玄武岩",
   "block.chipped.basalt_20": "玄武岩",
-  "block.chipped.vine_2": "藤蔓",
-  "block.chipped.vine_3": "藤蔓",
-  "block.chipped.vine_4": "藤蔓",
-  "block.chipped.vine_5": "藤蔓",
-  "block.chipped.vine_6": "藤蔓",
-  "block.chipped.vine_7": "藤蔓",
-  "block.chipped.vine_8": "藤蔓",
   "block.chipped.melon_1": "西瓜",
   "block.chipped.melon_2": "西瓜",
   "block.chipped.melon_3": "西瓜",
@@ -2270,6 +2279,226 @@
   "block.chipped.special_lantern_2": "灯笼",
   "block.chipped.special_lantern_3": "灯笼",
   "block.chipped.special_lantern_4": "灯笼",
+  "block.chipped.brown_mushroom_1": "棕色蘑菇",
+  "block.chipped.brown_mushroom_2": "棕色蘑菇",
+  "block.chipped.brown_mushroom_3": "棕色蘑菇",
+  "block.chipped.brown_mushroom_4": "棕色蘑菇",
+  "block.chipped.brown_mushroom_5": "棕色蘑菇",
+  "block.chipped.brown_mushroom_6": "棕色蘑菇",
+  "block.chipped.brown_mushroom_7": "棕色蘑菇",
+  "block.chipped.brown_mushroom_8": "棕色蘑菇",
+  "block.chipped.brown_mushroom_9": "棕色蘑菇",
+  "block.chipped.brown_mushroom_10": "棕色蘑菇",
+  "block.chipped.brown_mushroom_11": "棕色蘑菇",
+  "block.chipped.brown_mushroom_12": "棕色蘑菇",
+  "block.chipped.brown_mushroom_13": "棕色蘑菇",
+  "block.chipped.brown_mushroom_14": "棕色蘑菇",
+  "block.chipped.brown_mushroom_15": "棕色蘑菇",
+  "block.chipped.red_mushroom_1": "红色蘑菇",
+  "block.chipped.red_mushroom_2": "红色蘑菇",
+  "block.chipped.red_mushroom_3": "红色蘑菇",
+  "block.chipped.red_mushroom_4": "红色蘑菇",
+  "block.chipped.red_mushroom_5": "红色蘑菇",
+  "block.chipped.red_mushroom_6": "红色蘑菇",
+  "block.chipped.red_mushroom_7": "红色蘑菇",
+  "block.chipped.red_mushroom_8": "红色蘑菇",
+  "block.chipped.red_mushroom_9": "红色蘑菇",
+  "block.chipped.red_mushroom_10": "红色蘑菇",
+  "block.chipped.red_mushroom_11": "红色蘑菇",
+  "block.chipped.red_mushroom_12": "红色蘑菇",
+  "block.chipped.red_mushroom_13": "红色蘑菇",
+  "block.chipped.red_mushroom_14": "红色蘑菇",
+  "block.chipped.red_mushroom_15": "红色蘑菇",
+  "block.chipped.warped_fungus_1": "诡异菌",
+  "block.chipped.warped_fungus_2": "诡异菌",
+  "block.chipped.warped_fungus_3": "诡异菌",
+  "block.chipped.warped_fungus_4": "诡异菌",
+  "block.chipped.warped_fungus_5": "诡异菌",
+  "block.chipped.warped_fungus_6": "诡异菌",
+  "block.chipped.warped_fungus_7": "诡异菌",
+  "block.chipped.warped_fungus_8": "诡异菌",
+  "block.chipped.warped_fungus_9": "诡异菌",
+  "block.chipped.warped_fungus_10": "诡异菌",
+  "block.chipped.warped_fungus_11": "诡异菌",
+  "block.chipped.warped_fungus_12": "诡异菌",
+  "block.chipped.warped_fungus_13": "诡异菌",
+  "block.chipped.warped_fungus_14": "诡异菌",
+  "block.chipped.crimson_fungus_1": "绯红菌",
+  "block.chipped.crimson_fungus_2": "绯红菌",
+  "block.chipped.crimson_fungus_3": "绯红菌",
+  "block.chipped.crimson_fungus_4": "绯红菌",
+  "block.chipped.crimson_fungus_5": "绯红菌",
+  "block.chipped.crimson_fungus_6": "绯红菌",
+  "block.chipped.crimson_fungus_7": "绯红菌",
+  "block.chipped.crimson_fungus_8": "绯红菌",
+  "block.chipped.crimson_fungus_9": "绯红菌",
+  "block.chipped.crimson_fungus_10": "绯红菌",
+  "block.chipped.crimson_fungus_11": "绯红菌",
+  "block.chipped.crimson_fungus_12": "绯红菌",
+  "block.chipped.crimson_fungus_13": "绯红菌",
+  "block.chipped.crimson_fungus_14": "绯红菌",
+  "block.chipped.crimson_fungus_15": "绯红菌",
+  "block.chipped.warped_roots_1": "诡异菌索",
+  "block.chipped.warped_roots_2": "诡异菌索",
+  "block.chipped.warped_roots_3": "诡异菌索",
+  "block.chipped.warped_roots_4": "诡异菌索",
+  "block.chipped.warped_roots_5": "诡异菌索",
+  "block.chipped.warped_roots_6": "诡异菌索",
+  "block.chipped.warped_roots_7": "诡异菌索",
+  "block.chipped.warped_roots_8": "诡异菌索",
+  "block.chipped.warped_roots_9": "诡异菌索",
+  "block.chipped.crimson_roots_1": "绯红菌索",
+  "block.chipped.crimson_roots_2": "绯红菌索",
+  "block.chipped.crimson_roots_3": "绯红菌索",
+  "block.chipped.crimson_roots_4": "绯红菌索",
+  "block.chipped.crimson_roots_5": "绯红菌索",
+  "block.chipped.crimson_roots_6": "绯红菌索",
+  "block.chipped.crimson_roots_7": "绯红菌索",
+  "block.chipped.crimson_roots_8": "绯红菌索",
+  "block.chipped.crimson_roots_9": "绯红菌索",
+  "block.chipped.crimson_roots_10": "绯红菌索",
+  "block.chipped.crimson_roots_11": "绯红菌索",
+  "block.chipped.crimson_roots_12": "绯红菌索",
+  "block.chipped.crimson_roots_13": "绯红菌索",
+  "block.chipped.crimson_roots_14": "绯红菌索",
+  "block.chipped.nether_sprouts_1": "下界苗",
+  "block.chipped.nether_sprouts_2": "下界苗",
+  "block.chipped.nether_sprouts_3": "下界苗",
+  "block.chipped.nether_sprouts_4": "下界苗",
+  "block.chipped.nether_sprouts_5": "下界苗",
+  "block.chipped.nether_sprouts_6": "下界苗",
+  "block.chipped.nether_sprouts_7": "下界苗",
+  "block.chipped.nether_sprouts_8": "下界苗",
+  "block.chipped.nether_sprouts_9": "下界苗",
+  "block.chipped.nether_sprouts_10": "下界苗",
+  "block.chipped.nether_sprouts_11": "下界苗",
+  "block.chipped.nether_sprouts_12": "下界苗",
+  "block.chipped.nether_sprouts_13": "下界苗",
+  "block.chipped.nether_sprouts_14": "下界苗",
+  "block.chipped.nether_sprouts_15": "下界苗",
+  "block.chipped.nether_sprouts_16": "下界苗",
+  "block.chipped.nether_sprouts_17": "下界苗",
+  "block.chipped.nether_sprouts_18": "下界苗",
+  "block.chipped.nether_sprouts_19": "下界苗",
+  "block.chipped.nether_sprouts_20": "下界苗",
+  "block.chipped.brown_mushroom_block_1": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_2": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_3": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_4": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_5": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_6": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_7": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_8": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_9": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_10": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_11": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_12": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_13": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_14": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_15": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_16": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_17": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_18": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_19": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_20": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_21": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_22": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_23": "棕色蘑菇方块",
+  "block.chipped.brown_mushroom_block_24": "棕色蘑菇方块",
+  "block.chipped.red_mushroom_block_1": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_2": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_3": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_4": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_5": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_6": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_7": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_8": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_9": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_10": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_11": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_12": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_13": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_14": "红色蘑菇方块",
+  "block.chipped.red_mushroom_block_15": "红色蘑菇方块",
+  "block.chipped.warped_wart_block_1": "诡异疣块",
+  "block.chipped.warped_wart_block_2": "诡异疣块",
+  "block.chipped.warped_wart_block_3": "诡异疣块",
+  "block.chipped.warped_wart_block_4": "诡异疣块",
+  "block.chipped.warped_wart_block_5": "诡异疣块",
+  "block.chipped.warped_wart_block_6": "诡异疣块",
+  "block.chipped.warped_wart_block_7": "诡异疣块",
+  "block.chipped.warped_wart_block_8": "诡异疣块",
+  "block.chipped.warped_wart_block_9": "诡异疣块",
+  "block.chipped.warped_wart_block_10": "诡异疣块",
+  "block.chipped.warped_wart_block_11": "诡异疣块",
+  "block.chipped.warped_wart_block_12": "诡异疣块",
+  "block.chipped.warped_wart_block_13": "诡异疣块",
+  "block.chipped.warped_wart_block_14": "诡异疣块",
+  "block.chipped.nether_wart_block_1": "下界疣块",
+  "block.chipped.nether_wart_block_2": "下界疣块",
+  "block.chipped.nether_wart_block_3": "下界疣块",
+  "block.chipped.nether_wart_block_4": "下界疣块",
+  "block.chipped.nether_wart_block_5": "下界疣块",
+  "block.chipped.nether_wart_block_6": "下界疣块",
+  "block.chipped.nether_wart_block_7": "下界疣块",
+  "block.chipped.nether_wart_block_8": "下界疣块",
+  "block.chipped.nether_wart_block_9": "下界疣块",
+  "block.chipped.nether_wart_block_10": "下界疣块",
+  "block.chipped.nether_wart_block_11": "下界疣块",
+  "block.chipped.nether_wart_block_12": "下界疣块",
+  "block.chipped.nether_wart_block_13": "下界疣块",
+  "block.chipped.lily_pad_1": "睡莲",
+  "block.chipped.lily_pad_2": "睡莲",
+  "block.chipped.lily_pad_3": "睡莲",
+  "block.chipped.lily_pad_4": "睡莲",
+  "block.chipped.lily_pad_5": "睡莲",
+  "block.chipped.lily_pad_6": "睡莲",
+  "block.chipped.soul_sand_1": "灵魂沙",
+  "block.chipped.soul_sand_2": "灵魂沙",
+  "block.chipped.soul_sand_3": "灵魂沙",
+  "block.chipped.soul_sand_4": "灵魂沙",
+  "block.chipped.soul_sand_5": "灵魂沙",
+  "block.chipped.soul_sand_6": "灵魂沙",
+  "block.chipped.soul_sand_7": "灵魂沙",
+  "block.chipped.soul_sand_8": "灵魂沙",
+  "block.chipped.soul_sand_9": "灵魂沙",
+  "block.chipped.soul_sand_10": "灵魂沙",
+  "block.chipped.soul_sand_11": "灵魂沙",
+  "block.chipped.dried_kelp_block_1": "干海带块",
+  "block.chipped.dried_kelp_block_2": "干海带块",
+  "block.chipped.dried_kelp_block_3": "干海带块",
+  "block.chipped.dried_kelp_block_4": "干海带块",
+  "block.chipped.dried_kelp_block_5": "干海带块",
+  "block.chipped.dried_kelp_block_6": "干海带块",
+  "block.chipped.dried_kelp_block_7": "干海带块",
+  "block.chipped.dried_kelp_block_8": "干海带块",
+  "block.chipped.dried_kelp_block_9": "干海带块",
+  "block.chipped.dried_kelp_block_10": "干海带块",
+  "block.chipped.dried_kelp_block_11": "干海带块",
+  "block.chipped.dried_kelp_block_12": "干海带块",
+  "block.chipped.pumpkin_1": "南瓜",
+  "block.chipped.pumpkin_2": "南瓜",
+  "block.chipped.pumpkin_3": "南瓜",
+  "block.chipped.pumpkin_4": "南瓜",
+  "block.chipped.pumpkin_5": "南瓜",
+  "block.chipped.pumpkin_6": "南瓜",
+  "block.chipped.pumpkin_7": "南瓜",
+  "block.chipped.pumpkin_8": "南瓜",
+  "block.chipped.pumpkin_9": "南瓜",
+  "block.chipped.pumpkin_10": "南瓜",
+  "block.chipped.pumpkin_11": "南瓜",
+  "block.chipped.pumpkin_12": "南瓜",
+  "block.chipped.pumpkin_13": "南瓜",
+  "block.chipped.cobweb_1": "蜘蛛网",
+  "block.chipped.cobweb_2": "蜘蛛网",
+  "block.chipped.cobweb_3": "蜘蛛网",
+  "block.chipped.cobweb_4": "蜘蛛网",
+  "block.chipped.cobweb_5": "蜘蛛网",
+  "block.chipped.cobweb_6": "蜘蛛网",
+  "block.chipped.cobweb_7": "蜘蛛网",
+  "block.chipped.cobweb_8": "蜘蛛网",
+  "block.chipped.cobweb_9": "蜘蛛网",
+  "block.chipped.cobweb_10": "蜘蛛网",
   "container.chipped.botanist_workbench": "植物学家工作台",
   "container.chipped.glassblower": "玻璃吹制机",
   "container.chipped.carpenters_table": "木匠桌",