From 2a1bff37c4065ae293deac0c38d7e2aaa473b4fe Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Tue, 16 Jan 2024 08:49:34 +0500 Subject: [PATCH] buildtools --- .github/buildtools/modpack/manifest.json | 946 +++++++++++------------ .github/buildtools/modpack/modlist.html | 200 ++--- .github/workflows/release.yml | 38 +- CHANGELOG_EN.md | 10 + CHANGELOG.md => CHANGELOG_RU.md | 4 +- 5 files changed, 616 insertions(+), 582 deletions(-) create mode 100644 CHANGELOG_EN.md rename CHANGELOG.md => CHANGELOG_RU.md (99%) diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index cbdcc814c..ded8e0c8c 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -16,83 +16,13 @@ "projectID": 385053, "files": [ { - "projectID": 60089, - "fileID": 4581240, + "projectID": 238086, + "fileID": 5012072, "required": true }, { - "projectID": 912469, - "fileID": 4956177, - "required": true - }, - { - "projectID": 410295, - "fileID": 5028413, - "required": true - }, - { - "projectID": 665658, - "fileID": 5012164, - "required": true - }, - { - "projectID": 309927, - "fileID": 4985525, - "required": true - }, - { - "projectID": 251407, - "fileID": 4751740, - "required": true - }, - { - "projectID": 521393, - "fileID": 4837449, - "required": true - }, - { - "projectID": 435044, - "fileID": 4596768, - "required": true - }, - { - "projectID": 404468, - "fileID": 4623116, - "required": true - }, - { - "projectID": 453394, - "fileID": 4976486, - "required": true - }, - { - "projectID": 439890, - "fileID": 4929694, - "required": true - }, - { - "projectID": 302973, - "fileID": 4976574, - "required": true - }, - { - "projectID": 266890, - "fileID": 4994127, - "required": true - }, - { - "projectID": 404465, - "fileID": 4864329, - "required": true - }, - { - "projectID": 581495, - "fileID": 4952626, - "required": true - }, - { - "projectID": 499980, - "fileID": 5025566, + "projectID": 841001, + "fileID": 4945181, "required": true }, { @@ -101,38 +31,18 @@ "required": true }, { - "projectID": 908741, - "fileID": 4984832, + "projectID": 910506, + "fileID": 4866426, "required": true }, { - "projectID": 367706, - "fileID": 5028692, + "projectID": 310111, + "fileID": 4951142, "required": true }, { - "projectID": 263420, - "fileID": 4933782, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, - "required": true - }, - { - "projectID": 254284, - "fileID": 4887789, - "required": true - }, - { - "projectID": 429235, - "fileID": 4810975, - "required": true - }, - { - "projectID": 585406, - "fileID": 5021484, + "projectID": 282001, + "fileID": 5005529, "required": true }, { @@ -140,6 +50,46 @@ "fileID": 4906217, "required": true }, + { + "projectID": 940350, + "fileID": 4922586, + "required": true + }, + { + "projectID": 283644, + "fileID": 4913663, + "required": true + }, + { + "projectID": 912469, + "fileID": 4956177, + "required": true + }, + { + "projectID": 297038, + "fileID": 4969628, + "required": true + }, + { + "projectID": 658722, + "fileID": 4594978, + "required": true + }, + { + "projectID": 299540, + "fileID": 4711441, + "required": true + }, + { + "projectID": 439890, + "fileID": 4929694, + "required": true + }, + { + "projectID": 433760, + "fileID": 5008760, + "required": true + }, { "projectID": 401648, "fileID": 4863626, @@ -150,309 +100,309 @@ "fileID": 4944918, "required": true }, - { - "projectID": 433760, - "fileID": 5008760, - "required": true - }, - { - "projectID": 324717, - "fileID": 4986594, - "required": true - }, - { - "projectID": 931925, - "fileID": 5026257, - "required": true - }, - { - "projectID": 233071, - "fileID": 4939240, - "required": true - }, - { - "projectID": 658722, - "fileID": 4594978, - "required": true - }, - { - "projectID": 583345, - "fileID": 4925840, - "required": true - }, - { - "projectID": 316582, - "fileID": 4973430, - "required": true - }, - { - "projectID": 237307, - "fileID": 4600191, - "required": true - }, - { - "projectID": 299540, - "fileID": 4711441, - "required": true - }, - { - "projectID": 365281, - "fileID": 4612683, - "required": true - }, - { - "projectID": 240633, - "fileID": 4655091, - "required": true - }, - { - "projectID": 270441, - "fileID": 4578892, - "required": true - }, - { - "projectID": 292038, - "fileID": 4594106, - "required": true - }, - { - "projectID": 916493, - "fileID": 4988266, - "required": true - }, - { - "projectID": 790626, - "fileID": 5027104, - "required": true - }, - { - "projectID": 357540, - "fileID": 4699629, - "required": true - }, - { - "projectID": 238086, - "fileID": 5012072, - "required": true - }, - { - "projectID": 231095, - "fileID": 4787442, - "required": true - }, - { - "projectID": 297038, - "fileID": 4969628, - "required": true - }, - { - "projectID": 633412, - "fileID": 5016280, - "required": true - }, - { - "projectID": 282001, - "fileID": 5005529, - "required": true - }, - { - "projectID": 871755, - "fileID": 4999501, - "required": true - }, - { - "projectID": 714158, - "fileID": 4987747, - "required": true - }, - { - "projectID": 858542, - "fileID": 4779110, - "required": true - }, - { - "projectID": 841001, - "fileID": 4945181, - "required": true - }, - { - "projectID": 326652, - "fileID": 4979375, - "required": true - }, - { - "projectID": 314905, - "fileID": 4596742, - "required": true - }, - { - "projectID": 495476, - "fileID": 5024644, - "required": true - }, - { - "projectID": 459701, - "fileID": 4766090, - "required": true - }, - { - "projectID": 531761, - "fileID": 4943500, - "required": true - }, - { - "projectID": 570630, - "fileID": 4936333, - "required": true - }, - { - "projectID": 654373, - "fileID": 4873766, - "required": true - }, - { - "projectID": 636608, - "fileID": 4982660, - "required": true - }, - { - "projectID": 511770, - "fileID": 4606615, - "required": true - }, - { - "projectID": 538149, - "fileID": 4620037, - "required": true - }, - { - "projectID": 328085, - "fileID": 4835191, - "required": true - }, - { - "projectID": 306770, - "fileID": 4966125, - "required": true - }, - { - "projectID": 492574, - "fileID": 4580511, - "required": true - }, - { - "projectID": 411045, - "fileID": 4578649, - "required": true - }, - { - "projectID": 288885, - "fileID": 4711423, - "required": true - }, - { - "projectID": 283644, - "fileID": 4913663, - "required": true - }, - { - "projectID": 831663, - "fileID": 4894789, - "required": true - }, - { - "projectID": 257814, - "fileID": 5005088, - "required": true - }, - { - "projectID": 255389, - "fileID": 4798205, - "required": true - }, - { - "projectID": 250398, - "fileID": 4646682, - "required": true - }, - { - "projectID": 475117, - "fileID": 4711435, - "required": true - }, - { - "projectID": 312664, - "fileID": 4745380, - "required": true - }, { "projectID": 880532, "fileID": 4895948, "required": true }, - { - "projectID": 260262, - "fileID": 4581167, - "required": true - }, - { - "projectID": 927874, - "fileID": 4968758, - "required": true - }, - { - "projectID": 513402, - "fileID": 5033855, - "required": true - }, - { - "projectID": 844019, - "fileID": 4893142, - "required": true - }, - { - "projectID": 688231, - "fileID": 4836196, - "required": true - }, - { - "projectID": 943925, - "fileID": 4926070, - "required": true - }, - { - "projectID": 272335, - "fileID": 4990314, - "required": true - }, - { - "projectID": 308240, - "fileID": 4820041, - "required": true - }, - { - "projectID": 410811, - "fileID": 4896152, - "required": true - }, - { - "projectID": 416294, - "fileID": 4944325, - "required": true - }, { "projectID": 232131, "fileID": 4635878, "required": true }, + { + "projectID": 448233, + "fileID": 4763645, + "required": true + }, + { + "projectID": 511770, + "fileID": 4606615, + "required": true + }, + { + "projectID": 266890, + "fileID": 4994127, + "required": true + }, + { + "projectID": 916493, + "fileID": 4988266, + "required": true + }, + { + "projectID": 714158, + "fileID": 4987747, + "required": true + }, + { + "projectID": 499980, + "fileID": 5025566, + "required": true + }, + { + "projectID": 889915, + "fileID": 4932157, + "required": true + }, + { + "projectID": 231095, + "fileID": 4787442, + "required": true + }, + { + "projectID": 233071, + "fileID": 4939240, + "required": true + }, + { + "projectID": 270441, + "fileID": 4578892, + "required": true + }, + { + "projectID": 254284, + "fileID": 4887789, + "required": true + }, + { + "projectID": 858542, + "fileID": 4779110, + "required": true + }, + { + "projectID": 526854, + "fileID": 4631193, + "required": true + }, + { + "projectID": 538149, + "fileID": 4620037, + "required": true + }, + { + "projectID": 317780, + "fileID": 4929640, + "required": true + }, + { + "projectID": 688231, + "fileID": 4836196, + "required": true + }, + { + "projectID": 581495, + "fileID": 4952626, + "required": true + }, + { + "projectID": 410295, + "fileID": 5028413, + "required": true + }, + { + "projectID": 411045, + "fileID": 4578649, + "required": true + }, + { + "projectID": 404465, + "fileID": 4864329, + "required": true + }, + { + "projectID": 495693, + "fileID": 4870168, + "required": true + }, + { + "projectID": 263420, + "fileID": 4933782, + "required": true + }, + { + "projectID": 306770, + "fileID": 4966125, + "required": true + }, + { + "projectID": 410811, + "fileID": 4896152, + "required": true + }, + { + "projectID": 674852, + "fileID": 4828026, + "required": true + }, + { + "projectID": 790626, + "fileID": 5027104, + "required": true + }, + { + "projectID": 328085, + "fileID": 4835191, + "required": true + }, + { + "projectID": 292038, + "fileID": 4594106, + "required": true + }, + { + "projectID": 429235, + "fileID": 4810975, + "required": true + }, + { + "projectID": 531761, + "fileID": 4943500, + "required": true + }, + { + "projectID": 844019, + "fileID": 4893142, + "required": true + }, + { + "projectID": 513402, + "fileID": 5035680, + "required": true + }, + { + "projectID": 314905, + "fileID": 4596742, + "required": true + }, + { + "projectID": 312664, + "fileID": 4745380, + "required": true + }, + { + "projectID": 348521, + "fileID": 4973441, + "required": true + }, + { + "projectID": 326652, + "fileID": 4979375, + "required": true + }, + { + "projectID": 404468, + "fileID": 4623116, + "required": true + }, + { + "projectID": 272335, + "fileID": 4990314, + "required": true + }, + { + "projectID": 871755, + "fileID": 4999501, + "required": true + }, + { + "projectID": 429371, + "fileID": 4884096, + "required": true + }, + { + "projectID": 237307, + "fileID": 4600191, + "required": true + }, + { + "projectID": 521393, + "fileID": 4837449, + "required": true + }, + { + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 585406, + "fileID": 5021484, + "required": true + }, + { + "projectID": 309927, + "fileID": 4985525, + "required": true + }, { "projectID": 233019, "fileID": 4578262, "required": true }, { - "projectID": 940350, - "fileID": 4922586, + "projectID": 908741, + "fileID": 5034486, + "required": true + }, + { + "projectID": 459701, + "fileID": 4766090, + "required": true + }, + { + "projectID": 570630, + "fileID": 4936333, + "required": true + }, + { + "projectID": 365281, + "fileID": 4612683, + "required": true + }, + { + "projectID": 251407, + "fileID": 4751740, + "required": true + }, + { + "projectID": 927874, + "fileID": 4968758, + "required": true + }, + { + "projectID": 357540, + "fileID": 4699629, + "required": true + }, + { + "projectID": 636608, + "fileID": 4982660, + "required": true + }, + { + "projectID": 654373, + "fileID": 4873766, + "required": true + }, + { + "projectID": 663477, + "fileID": 4826822, + "required": true + }, + { + "projectID": 250398, + "fileID": 4646682, + "required": true + }, + { + "projectID": 316582, + "fileID": 4973430, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, "required": true }, { @@ -460,6 +410,91 @@ "fileID": 4614555, "required": true }, + { + "projectID": 354353, + "fileID": 4891706, + "required": true + }, + { + "projectID": 387638, + "fileID": 4691333, + "required": true + }, + { + "projectID": 831663, + "fileID": 4894789, + "required": true + }, + { + "projectID": 633412, + "fileID": 5016280, + "required": true + }, + { + "projectID": 665658, + "fileID": 5012164, + "required": true + }, + { + "projectID": 324717, + "fileID": 4986594, + "required": true + }, + { + "projectID": 367706, + "fileID": 5028692, + "required": true + }, + { + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 351441, + "fileID": 4613538, + "required": true + }, + { + "projectID": 720848, + "fileID": 4608859, + "required": true + }, + { + "projectID": 453394, + "fileID": 4976486, + "required": true + }, + { + "projectID": 255389, + "fileID": 4798205, + "required": true + }, + { + "projectID": 289412, + "fileID": 4929479, + "required": true + }, + { + "projectID": 302973, + "fileID": 4976574, + "required": true + }, + { + "projectID": 422301, + "fileID": 4993659, + "required": true + }, + { + "projectID": 475117, + "fileID": 4711435, + "required": true + }, + { + "projectID": 288885, + "fileID": 4711423, + "required": true + }, { "projectID": 890405, "fileID": 5016959, @@ -470,109 +505,74 @@ "fileID": 4956709, "required": true }, - { - "projectID": 333287, - "fileID": 4833106, - "required": true - }, - { - "projectID": 429371, - "fileID": 4884096, - "required": true - }, - { - "projectID": 387638, - "fileID": 4691333, - "required": true - }, - { - "projectID": 448233, - "fileID": 4763645, - "required": true - }, - { - "projectID": 618298, - "fileID": 4993651, - "required": true - }, - { - "projectID": 354353, - "fileID": 4891706, - "required": true - }, - { - "projectID": 889915, - "fileID": 4932157, - "required": true - }, - { - "projectID": 351441, - "fileID": 4613538, - "required": true - }, - { - "projectID": 910506, - "fileID": 4866426, - "required": true - }, - { - "projectID": 223794, - "fileID": 5014714, - "required": true - }, - { - "projectID": 310111, - "fileID": 4951142, - "required": true - }, - { - "projectID": 495693, - "fileID": 4870168, - "required": true - }, - { - "projectID": 289412, - "fileID": 4929479, - "required": true - }, - { - "projectID": 526854, - "fileID": 4631193, - "required": true - }, - { - "projectID": 422301, - "fileID": 4993659, - "required": true - }, - { - "projectID": 663477, - "fileID": 4826822, - "required": true - }, { "projectID": 459929, "fileID": 4936437, "required": true }, + { + "projectID": 943925, + "fileID": 4926070, + "required": true + }, { "projectID": 634062, "fileID": 4610474, "required": true }, { - "projectID": 674852, - "fileID": 4828026, + "projectID": 333287, + "fileID": 4833106, "required": true }, { - "projectID": 720848, - "fileID": 4608859, + "projectID": 495476, + "fileID": 5024644, "required": true }, { - "projectID": 317780, - "fileID": 4929640, + "projectID": 931925, + "fileID": 5026257, + "required": true + }, + { + "projectID": 308240, + "fileID": 4820041, + "required": true + }, + { + "projectID": 416294, + "fileID": 4944325, + "required": true + }, + { + "projectID": 257814, + "fileID": 5005088, + "required": true + }, + { + "projectID": 435044, + "fileID": 4596768, + "required": true + }, + { + "projectID": 618298, + "fileID": 4993651, + "required": true + }, + { + "projectID": 492574, + "fileID": 4580511, + "required": true + }, + { + "projectID": 223794, + "fileID": 5032144, + "required": true + }, + { + "projectID": 240633, + "fileID": 4655091, "required": true } ], diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index 4d0d922a9..4e8b1b8ba 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,114 +1,114 @@  diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 076ebfd04..23329baa6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,8 @@ jobs: project_name: ${{ steps.info.outputs.project_name }} project_version: ${{ steps.info.outputs.project_version }} mc_version: ${{ steps.info.outputs.mc_version }} - changelog: ${{ steps.changelog.outputs.description }} + changelog_ru: ${{ steps.changelog_ru.outputs.description }} + changelog_en: ${{ steps.changelog_en.outputs.description }} steps: - name: Checkout @@ -57,10 +58,16 @@ jobs: fi - name: Changelog Parser - id: changelog + id: changelog_ru uses: coditory/changelog-parser@v1.0.2 with: - path: CHANGELOG.md + path: CHANGELOG_RU.md + + - name: Changelog Parser + id: changelog_en + uses: coditory/changelog-parser@v1.0.2 + with: + path: CHANGELOG_EN.md build-cf-modpack: name: Build CF Modpack @@ -206,7 +213,12 @@ jobs: project-id: ${{ vars.CF_MODPACK_ID }} modpack-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip modpack-server-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip - changelog: ${{ needs.modpack-info.outputs.changelog }} + changelog: | + RU + ${{ needs.modpack-info.outputs.changelog_ru }} + + EN + ${{ needs.modpack-info.outputs.changelog_en }} changelog-format: markdown game-version: ${{ needs.modpack-info.outputs.mc_version }} display-name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }} @@ -242,7 +254,9 @@ jobs: # project-id: ${{ vars.MODRINTH_MODPACK_ID }} # modpack-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mrd.zip # modpack-server-path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip - # changelog: "${{ needs.modpack-info.outputs.changelog }}" + # changelog: | + # ${{ needs.modpack-info.outputs.changelog_ru }} + # ${{ needs.modpack-info.outputs.changelog_en }} # changelog-format: markdown # game-version: ${{ needs.modpack-info.outputs.mc_version }} # display-name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }} @@ -265,7 +279,12 @@ jobs: prerelease: false generate_release_notes: true name: ${{ needs.modpack-info.outputs.project_version }} - body: ${{ needs.modpack-info.outputs.changelog }} + body: | + RU + ${{ needs.modpack-info.outputs.changelog_ru }} + + EN + ${{ needs.modpack-info.outputs.changelog_en }} files: | ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip @@ -293,8 +312,11 @@ jobs: **GameVersion**: `${{ needs.modpack-info.outputs.mc_version }}` **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/${{ needs.release-curseforge.outputs.cf_release_id }}) - **Changelog** - ```${{ needs.modpack-info.outputs.changelog }}``` + **Changelog** + :flag_ru: + ```${{ needs.modpack-info.outputs.changelog_ru }}``` + :flag_gb: + ```${{ needs.modpack-info.outputs.changelog_en }}``` embed-color: 5814783 # close-fixed-issues: diff --git a/CHANGELOG_EN.md b/CHANGELOG_EN.md new file mode 100644 index 000000000..45337117b --- /dev/null +++ b/CHANGELOG_EN.md @@ -0,0 +1,10 @@ +# Changelog + +## [0.6.3] - 16.01.2024 +- Fixed a bug when it was impossible to make a canoe. +- Added function to disable additional TFC-Ambiental integration. +- Fixed the quest for the copper ingot. +### Update mods +- TerraFirmaGreg 0.3.1 -> 0.3.2 +- appliedenergistics2 -> 15.0.20 +- embeddium -> 0.2.18 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG_RU.md similarity index 99% rename from CHANGELOG.md rename to CHANGELOG_RU.md index d48c63c1b..3b95401a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG_RU.md @@ -1,11 +1,13 @@ # Changelog -## [Unreleased] +## [0.6.3] - 16.01.2024 - Исправлен баг когда нельзя было сделать каное. - Добавлена функция отключения доп. интеграции TFC-Ambiental. - Исправлен квест на медный слиток. ### Обновленные моды - TerraFirmaGreg 0.3.1 -> 0.3.2 +- appliedenergistics2 -> 15.0.20 +- embeddium -> 0.2.18 ## [0.6.2] - 15.01.2024