From 60d03c87f86b3f477e0fd4f19a6feb0a4bd69e54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 16 May 2024 15:17:45 +0000 Subject: [PATCH 1/5] =?UTF-8?q?[GitHub=20Actions]=20=E3=83=89=E3=82=AD?= =?UTF-8?q?=E3=83=A5=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AE=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 対象のコミット: 06c7618287fcc70b50bb455bbf1a16ccfe676fc2 --- .github/README.md | 2 +- .github/README_jp.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/README.md b/.github/README.md index d60e568..4ca9ba5 100644 --- a/.github/README.md +++ b/.github/README.md @@ -307,7 +307,7 @@ Figura is available in [Forge](https://files.minecraftforge.net/net/minecraftfor ## Notes - I'm not responsible for any damages caused by using this avatar. -- This avatar is designed for work with no resource pack and no other mods are installed. An unexpected issue may occurs when you use it with any resource packs and mods (texture and armor inconsistencies, etc.). However, I won't support in these cases. +- This avatar is designed for work with no resource pack and no other mods are installed. An unexpected issue may occurs when you use it with any resource packs and mods (texture and armor inconsistencies, etc.). However, I may not support you in these cases. - There may be a bug which occurs in multiplayer because my ([Gakuto1112](https://github.com/Gakuto1112)) multiplayer environment to verify the avatar is insufficient. - Please [report an issue](https://github.com/Gakuto1112/SenkoSan/issues) if you find it. - Please contact me via [Discussions](https://github.com/Gakuto1112/SenkoSan/discussions) or [Discord](https://discord.com/) if you want to do for my avatars. My Discord name is "vinny_san" and display name is "ばにーさん". My display name in [Figura Discord server](https://discord.gg/figuramc) is "BunnySan/ばにーさん". diff --git a/.github/README_jp.md b/.github/README_jp.md index 785ee88..253f892 100644 --- a/.github/README_jp.md +++ b/.github/README_jp.md @@ -307,7 +307,7 @@ Figuraは[Forge](https://files.minecraftforge.net/net/minecraftforge/forge/)、[ ## 注意事項 - このアバターを使用して発生した、いかなる損害の責任も負いかねます。 -- このアバターは、デフォルトのリソースパックでの動作を想定しています。また、他MODの使用は想定していません。想定動作環境外ではテクスチャの不整合、防具が表示されない/非表示にならない、といった不具合が想定されます。この場合の不具合は対応しませんのでご了承下さい。 +- このアバターは、デフォルトのリソースパックでの動作を想定しています。また、他MODの使用は想定していません。想定動作環境外ではテクスチャの不整合、防具が表示されない/非表示にならない、といった不具合が想定されます。この場合の不具合は対応しない場合がありますのでご了承下さい。 - 私（[Gakuto1112](https://github.com/Gakuto1112)）のマルチプレイで動作検証を行う環境が不十分である為、マルチプレイにおいて発生する不具合がある可能性があります。 - 不具合がありましたら、[Issues](https://github.com/Gakuto1112/SenkoSan/issues)までご連絡下さい。 - アバター関係で私に連絡したい方は[Discussions](https://github.com/Gakuto1112/SenkoSan/discussions)または、[Discord](https://discord.com/)でご連絡下さい。私のDiscordのアカウント名は「vinny_san」で表示名は「ばにーさん」です。[FiguraのDiscordサーバー](https://discord.gg/figuramc)での表示名は「BunnySan/ばにーさん」です。 From e40d408f3404b9d8e4d5356949b41525640ac96f Mon Sep 17 00:00:00 2001 From: Gakuto1112 Date: Sat, 18 May 2024 00:41:18 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=82=B2=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=83=96=E3=83=A9=E3=83=B3=E3=83=81=E3=82=92=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E3=81=99=E3=82=8B=E3=83=AF=E3=83=BC=E3=82=AF=E3=83=95?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/get_target_branches.yml | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/get_target_branches.yml diff --git a/.github/workflows/get_target_branches.yml b/.github/workflows/get_target_branches.yml new file mode 100644 index 0000000..774d402 --- /dev/null +++ b/.github/workflows/get_target_branches.yml @@ -0,0 +1,28 @@ +name: Get target branches + +on: + workflow_call: + outputs: + target_branches: + description: The array of merge target branches + value: ${{ jobs.get_target_branches.outputs.target_branches }} + +jobs: + get_target_branches: + name: Get target branches + runs-on: ubuntu-latest + outputs: + target_branches: ${{ steps.output_target_branches.outputs.target_branches }} + steps: + - name: Checkout + uses: actions/checkout@v4.1.6 + with: + fetch-depth: 0 + - name: Get target branches + run: | + echo '[' > ./branch_list.json + git branch -r | grep ' origin/[A-Z][a-z]' | sed 's/ origin\//"/' | sed -z 's/\r//g; s/\n/", /g' | sed 's/, $//g' >> ./branch_list.json + echo ']' >> ./branch_list.json + - name: Output target branches + id: output_target_branches + run: echo target_branches=$(<./branch_list.json) >> $GITHUB_OUTPUT \ No newline at end of file From 9ef31e565061baf41f215d56834d677ae46d8556 Mon Sep 17 00:00:00 2001 From: Gakuto1112 Date: Sat, 18 May 2024 00:47:04 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A2=E5=AD=98=E3=81=AE=E3=83=AF?= =?UTF-8?q?=E3=83=BC=E3=82=AF=E3=83=95=E3=83=AD=E3=83=BC=E3=81=AE=E3=82=BF?= =?UTF-8?q?=E3=83=BC=E3=82=B2=E3=83=83=E3=83=88=E3=83=96=E3=83=A9=E3=83=B3?= =?UTF-8?q?=E3=83=81=E3=81=AE=E5=8F=96=E5=BE=97=E6=96=B9=E6=B3=95=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dispatch_readme.yml | 10 +++++++--- .github/workflows/generate_readme.yml | 5 +---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dispatch_readme.yml b/.github/workflows/dispatch_readme.yml index df3dc00..5f6bd69 100644 --- a/.github/workflows/dispatch_readme.yml +++ b/.github/workflows/dispatch_readme.yml @@ -1,4 +1,4 @@ -name: Dispatch README +name: Dispatch readme on: repository_dispatch: @@ -6,13 +6,17 @@ on: - dispatch_readme jobs: + get_target_branches: + name: Get target branches + uses: ./.github/workflows/get_target_branches.yml generate: - name: Generate README + name: Generate readme + needs: get_target_branches permissions: contents: write strategy: matrix: - target-branch: ${{ fromJSON(vars.TARGET_BRANCHES) }} + target-branch: ${{ fromJSON(needs.get_target_branches.outputs.target_branches) }} uses: Gakuto1112/FiguraAvatarsReadmeTemplate/.github/workflows/generate_my_figura_avatar_readme.yml@main with: branch-name: ${{ matrix.target-branch }} \ No newline at end of file diff --git a/.github/workflows/generate_readme.yml b/.github/workflows/generate_readme.yml index b23067b..03d4f88 100644 --- a/.github/workflows/generate_readme.yml +++ b/.github/workflows/generate_readme.yml @@ -3,10 +3,7 @@ name: Generate README on: push: branches: - - Senko - - Shiro - - Suzu - - Sora + - '[A-Z]*' paths: - .github/README_templates/** - .github/workflows/generate_readme.yml From 9fc8745cc2c389d528174602c2297628675b16cd Mon Sep 17 00:00:00 2001 From: Gakuto1112 Date: Sat, 18 May 2024 00:48:18 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=82=A2=E3=82=BB=E3=83=83=E3=83=88=E3=81=AB=E3=82=A2=E3=83=90?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E3=83=87=E3=83=BC=E3=82=BF=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=81=99=E3=82=8B=E3=83=AF=E3=83=BC=E3=82=AF=E3=83=95?= =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/attach_avatars.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/attach_avatars.yml diff --git a/.github/workflows/attach_avatars.yml b/.github/workflows/attach_avatars.yml new file mode 100644 index 0000000..cb08788 --- /dev/null +++ b/.github/workflows/attach_avatars.yml @@ -0,0 +1,20 @@ +name: Attach avatars to release assets + +on: + release: + types: + - released + - prereleased + +jobs: + get_target_branches: + name: Get target branches + uses: ./.github/workflows/get_target_branches.yml + attach_avatar: + name: Attach avatars to release assets + needs: get_target_branches + permissions: + contents: write + uses: Gakuto1112/MyFiguraAvatarPacker/.github/workflows/attach_avatars.yml@main + with: + target_branches: ${{ needs.get_target_branches.outputs.target_branches }} \ No newline at end of file From 177623b3a6cfa00a6f5d462edb34c1b19a3bbe0c Mon Sep 17 00:00:00 2001 From: Gakuto1112 Date: Sat, 18 May 2024 00:53:13 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=82=A2=E3=82=BB=E3=83=83=E3=83=88=E3=81=8B=E3=82=89=E3=81=AE?= =?UTF-8?q?=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=E6=A1=88?= =?UTF-8?q?=E5=86=85=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/README_templates/en.md | 3 +++ .github/README_templates/jp.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/README_templates/en.md b/.github/README_templates/en.md index 2c35eda..008edd7 100644 --- a/.github/README_templates/en.md +++ b/.github/README_templates/en.md @@ -289,6 +289,9 @@ Toggles whether messages which are showed frequently show or not. This setting w +#### Additional note +In addition to the avatar download method described here, you can also download avatar files from the "Releases" section on the right side of the repository's top page. A zip file of each avatar is attached to the "Assets" section of each release note. + ## Links diff --git a/.github/README_templates/jp.md b/.github/README_templates/jp.md index 7f4e249..70136aa 100644 --- a/.github/README_templates/jp.md +++ b/.github/README_templates/jp.md @@ -288,6 +288,9 @@ Mobが被っているプレイヤーの頭は設定に関わらず、デフォ +#### 追記事項 +ここに書かれてあるアバターのダウンロード方法の他に、レポジトリのトップページの右側にある「Releases」からでもアバターファイルをダウンロードできるようにしました。各リリースノートの「Assets」の項目に各アバターのzipファイルが添付されています。 + ## リンク集