From 7c6f8b25ad426d7d62130674f9e0eb27b4d9f3db Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 07:10:49 +0500 Subject: [PATCH 01/12] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 3524d97fe..7b6f294a1 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 3524d97fe8e67c03c0dd3cfe96feb51abc92beb8 +Subproject commit 7b6f294a14fd065e2b64ee1988db4d9ff912cf63 From f41316b0b684042f5e6455e048d0cb002aae0018 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 07:14:25 +0500 Subject: [PATCH 02/12] manifest --- .github/buildtools/modpack/manifest.json | 905 ++++++++++++----------- .github/buildtools/modpack/modlist.html | 201 ++--- CHANGELOG.md | 4 +- 3 files changed, 559 insertions(+), 551 deletions(-) diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index 277292408..cd048cba3 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -15,444 +15,74 @@ "author": "Exception, Xikaro", "projectID": 385053, "files": [ - { - "projectID": 662156, - "fileID": 4944918, - "required": true - }, - { - "projectID": 435044, - "fileID": 4596768, - "required": true - }, - { - "projectID": 618298, - "fileID": 4993651, - "required": true - }, - { - "projectID": 429235, - "fileID": 4810975, - "required": true - }, - { - "projectID": 232131, - "fileID": 4635878, - "required": true - }, - { - "projectID": 581495, - "fileID": 4952626, - "required": true - }, - { - "projectID": 282001, - "fileID": 5005529, - "required": true - }, - { - "projectID": 916493, - "fileID": 4988266, - "required": true - }, - { - "projectID": 927874, - "fileID": 4968758, - "required": true - }, - { - "projectID": 367706, - "fileID": 4776833, - "required": true - }, - { - "projectID": 889915, - "fileID": 4932157, - "required": true - }, - { - "projectID": 254284, - "fileID": 4887789, - "required": true - }, - { - "projectID": 526854, - "fileID": 4631193, - "required": true - }, - { - "projectID": 583345, - "fileID": 4925840, - "required": true - }, - { - "projectID": 312664, - "fileID": 4745380, - "required": true - }, - { - "projectID": 270441, - "fileID": 4578892, - "required": true - }, - { - "projectID": 419699, - "fileID": 4663010, - "required": true - }, - { - "projectID": 354353, - "fileID": 4891706, - "required": true - }, - { - "projectID": 908741, - "fileID": 4984832, - "required": true - }, - { - "projectID": 260262, - "fileID": 4581167, - "required": true - }, - { - "projectID": 931925, - "fileID": 5023095, - "required": true - }, - { - "projectID": 308240, - "fileID": 4820041, - "required": true - }, - { - "projectID": 263420, - "fileID": 4933782, - "required": true - }, - { - "projectID": 302973, - "fileID": 4976574, - "required": true - }, - { - "projectID": 636608, - "fileID": 4982660, - "required": true - }, - { - "projectID": 495693, - "fileID": 4870168, - "required": true - }, - { - "projectID": 411045, - "fileID": 4578649, - "required": true - }, - { - "projectID": 674852, - "fileID": 4828026, - "required": true - }, - { - "projectID": 654373, - "fileID": 4873766, - "required": true - }, - { - "projectID": 475117, - "fileID": 4711435, - "required": true - }, - { - "projectID": 531761, - "fileID": 4943500, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, - "required": true - }, - { - "projectID": 551894, - "fileID": 4688940, - "required": true - }, - { - "projectID": 410811, - "fileID": 4896152, - "required": true - }, - { - "projectID": 289412, - "fileID": 4929479, - "required": true - }, - { - "projectID": 880532, - "fileID": 4895948, - "required": true - }, - { - "projectID": 453394, - "fileID": 4976486, - "required": true - }, - { - "projectID": 513402, - "fileID": 5025070, - "required": true - }, - { - "projectID": 316582, - "fileID": 4973430, - "required": true - }, - { - "projectID": 297038, - "fileID": 4969628, - "required": true - }, - { - "projectID": 266890, - "fileID": 4994127, - "required": true - }, - { - "projectID": 326652, - "fileID": 4979375, - "required": true - }, - { - "projectID": 841001, - "fileID": 4945181, - "required": true - }, - { - "projectID": 416294, - "fileID": 4944325, - "required": true - }, - { - "projectID": 429371, - "fileID": 4884096, - "required": true - }, - { - "projectID": 790626, - "fileID": 4980929, - "required": true - }, - { - "projectID": 858542, - "fileID": 4779110, - "required": true - }, - { - "projectID": 299540, - "fileID": 4711441, - "required": true - }, - { - "projectID": 633412, - "fileID": 5016280, - "required": true - }, - { - "projectID": 663477, - "fileID": 4826822, - "required": true - }, - { - "projectID": 223794, - "fileID": 5014714, - "required": true - }, - { - "projectID": 871755, - "fileID": 4999501, - "required": true - }, - { - "projectID": 401648, - "fileID": 4863626, - "required": true - }, - { - "projectID": 365281, - "fileID": 4612683, - "required": true - }, - { - "projectID": 404468, - "fileID": 4623116, - "required": true - }, - { - "projectID": 912469, - "fileID": 4956177, - "required": true - }, - { - "projectID": 714158, - "fileID": 4987747, - "required": true - }, - { - "projectID": 238222, - "fileID": 4712868, - "required": true - }, - { - "projectID": 272335, - "fileID": 4990314, - "required": true - }, - { - "projectID": 422301, - "fileID": 4993659, - "required": true - }, - { - "projectID": 459929, - "fileID": 4936437, - "required": true - }, - { - "projectID": 823106, - "fileID": 4906217, - "required": true - }, - { - "projectID": 665658, - "fileID": 5012164, - "required": true - }, - { - "projectID": 410295, - "fileID": 4583492, - "required": true - }, - { - "projectID": 314905, - "fileID": 4596742, - "required": true - }, - { - "projectID": 890405, - "fileID": 5016959, - "required": true - }, - { - "projectID": 910506, - "fileID": 4866426, - "required": true - }, - { - "projectID": 658722, - "fileID": 4594978, - "required": true - }, - { - "projectID": 255389, - "fileID": 4798205, - "required": true - }, - { - "projectID": 940350, - "fileID": 4922586, - "required": true - }, - { - "projectID": 495476, - "fileID": 5024644, - "required": true - }, - { - "projectID": 288885, - "fileID": 4711423, - "required": true - }, - { - "projectID": 333287, - "fileID": 4833106, - "required": true - }, - { - "projectID": 511770, - "fileID": 4606615, - "required": true - }, - { - "projectID": 433760, - "fileID": 5008760, - "required": true - }, { "projectID": 317780, "fileID": 4929640, "required": true }, - { - "projectID": 240633, - "fileID": 4655091, - "required": true - }, - { - "projectID": 844019, - "fileID": 4893142, - "required": true - }, - { - "projectID": 238086, - "fileID": 5012072, - "required": true - }, - { - "projectID": 292038, - "fileID": 4594106, - "required": true - }, - { - "projectID": 60089, - "fileID": 4581240, - "required": true - }, - { - "projectID": 404465, - "fileID": 4864329, - "required": true - }, - { - "projectID": 387638, - "fileID": 4691333, - "required": true - }, - { - "projectID": 439890, - "fileID": 4929694, - "required": true - }, - { - "projectID": 251407, - "fileID": 4751740, - "required": true - }, { "projectID": 448233, "fileID": 4763645, "required": true }, { - "projectID": 233019, - "fileID": 4578262, + "projectID": 263420, + "fileID": 4933782, "required": true }, { - "projectID": 328085, - "fileID": 4835191, + "projectID": 439890, + "fileID": 4929694, + "required": true + }, + { + "projectID": 526854, + "fileID": 4631193, + "required": true + }, + { + "projectID": 940350, + "fileID": 4922586, + "required": true + }, + { + "projectID": 422301, + "fileID": 4993659, + "required": true + }, + { + "projectID": 289412, + "fileID": 4929479, + "required": true + }, + { + "projectID": 238222, + "fileID": 4712868, + "required": true + }, + { + "projectID": 255389, + "fileID": 4798205, + "required": true + }, + { + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 890405, + "fileID": 5016959, + "required": true + }, + { + "projectID": 297038, + "fileID": 4969628, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, "required": true }, { @@ -461,23 +91,43 @@ "required": true }, { - "projectID": 237307, - "fileID": 4600191, + "projectID": 538149, + "fileID": 4620037, "required": true }, { - "projectID": 324717, - "fileID": 4986594, + "projectID": 410811, + "fileID": 4896152, "required": true }, { - "projectID": 357540, - "fileID": 4699629, + "projectID": 282001, + "fileID": 5005529, "required": true }, { - "projectID": 351441, - "fileID": 4613538, + "projectID": 880532, + "fileID": 4895948, + "required": true + }, + { + "projectID": 223794, + "fileID": 5014714, + "required": true + }, + { + "projectID": 459929, + "fileID": 4936437, + "required": true + }, + { + "projectID": 618298, + "fileID": 4993651, + "required": true + }, + { + "projectID": 513402, + "fileID": 5025070, "required": true }, { @@ -486,28 +136,53 @@ "required": true }, { - "projectID": 309927, - "fileID": 4985525, + "projectID": 272335, + "fileID": 4990314, "required": true }, { - "projectID": 570630, - "fileID": 4936333, + "projectID": 365281, + "fileID": 4612683, "required": true }, { - "projectID": 688231, - "fileID": 4836196, + "projectID": 270441, + "fileID": 4578892, "required": true }, { - "projectID": 580555, - "fileID": 5011031, + "projectID": 251407, + "fileID": 4751740, "required": true }, { - "projectID": 283644, - "fileID": 4913663, + "projectID": 495476, + "fileID": 5024644, + "required": true + }, + { + "projectID": 633412, + "fileID": 5016280, + "required": true + }, + { + "projectID": 435044, + "fileID": 4596768, + "required": true + }, + { + "projectID": 908741, + "fileID": 4984832, + "required": true + }, + { + "projectID": 495693, + "fileID": 4870168, + "required": true + }, + { + "projectID": 931925, + "fileID": 5023095, "required": true }, { @@ -516,23 +191,98 @@ "required": true }, { - "projectID": 818089, - "fileID": 4872397, + "projectID": 585406, + "fileID": 5021484, "required": true }, { - "projectID": 257814, - "fileID": 5005088, + "projectID": 308240, + "fileID": 4820041, "required": true }, { - "projectID": 943925, - "fileID": 4926070, + "projectID": 674852, + "fileID": 4828026, "required": true }, { - "projectID": 538149, - "fileID": 4620037, + "projectID": 233019, + "fileID": 4578262, + "required": true + }, + { + "projectID": 404468, + "fileID": 4623116, + "required": true + }, + { + "projectID": 429235, + "fileID": 4810975, + "required": true + }, + { + "projectID": 581495, + "fileID": 4952626, + "required": true + }, + { + "projectID": 570630, + "fileID": 4936333, + "required": true + }, + { + "projectID": 453394, + "fileID": 4976486, + "required": true + }, + { + "projectID": 889915, + "fileID": 4932157, + "required": true + }, + { + "projectID": 910506, + "fileID": 4866426, + "required": true + }, + { + "projectID": 511770, + "fileID": 4606615, + "required": true + }, + { + "projectID": 326652, + "fileID": 4979375, + "required": true + }, + { + "projectID": 351441, + "fileID": 4613538, + "required": true + }, + { + "projectID": 663477, + "fileID": 4826822, + "required": true + }, + { + "projectID": 871755, + "fileID": 4999501, + "required": true + }, + { + "projectID": 858542, + "fileID": 4779110, + "required": true + }, + { + "projectID": 531761, + "fileID": 4943500, + "required": true + }, + { + "projectID": 580555, + "fileID": 5011031, "required": true }, { @@ -540,10 +290,265 @@ "fileID": 4610474, "required": true }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, + { + "projectID": 654373, + "fileID": 4873766, + "required": true + }, + { + "projectID": 354353, + "fileID": 4891706, + "required": true + }, + { + "projectID": 823106, + "fileID": 4906217, + "required": true + }, + { + "projectID": 475117, + "fileID": 4711435, + "required": true + }, + { + "projectID": 927874, + "fileID": 4968758, + "required": true + }, + { + "projectID": 916493, + "fileID": 4988266, + "required": true + }, + { + "projectID": 299540, + "fileID": 4711441, + "required": true + }, + { + "projectID": 943925, + "fileID": 4926070, + "required": true + }, + { + "projectID": 240633, + "fileID": 4655091, + "required": true + }, + { + "projectID": 662156, + "fileID": 4944918, + "required": true + }, + { + "projectID": 688231, + "fileID": 4836196, + "required": true + }, + { + "projectID": 348521, + "fileID": 4973441, + "required": true + }, + { + "projectID": 790626, + "fileID": 5025316, + "required": true + }, + { + "projectID": 292038, + "fileID": 4594106, + "required": true + }, + { + "projectID": 416294, + "fileID": 4944325, + "required": true + }, + { + "projectID": 288885, + "fileID": 4711423, + "required": true + }, + { + "projectID": 312664, + "fileID": 4745380, + "required": true + }, + { + "projectID": 410295, + "fileID": 4583492, + "required": true + }, + { + "projectID": 841001, + "fileID": 4945181, + "required": true + }, + { + "projectID": 283644, + "fileID": 4913663, + "required": true + }, + { + "projectID": 309927, + "fileID": 4985525, + "required": true + }, + { + "projectID": 302973, + "fileID": 4976574, + "required": true + }, + { + "projectID": 387638, + "fileID": 4691333, + "required": true + }, + { + "projectID": 818089, + "fileID": 4872397, + "required": true + }, + { + "projectID": 254284, + "fileID": 4887789, + "required": true + }, + { + "projectID": 419699, + "fileID": 4663010, + "required": true + }, + { + "projectID": 316582, + "fileID": 4973430, + "required": true + }, + { + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 333287, + "fileID": 4833106, + "required": true + }, + { + "projectID": 658722, + "fileID": 4594978, + "required": true + }, + { + "projectID": 324717, + "fileID": 4986594, + "required": true + }, + { + "projectID": 411045, + "fileID": 4578649, + "required": true + }, + { + "projectID": 238086, + "fileID": 5012072, + "required": true + }, + { + "projectID": 912469, + "fileID": 4956177, + "required": true + }, + { + "projectID": 844019, + "fileID": 4893142, + "required": true + }, + { + "projectID": 314905, + "fileID": 4596742, + "required": true + }, + { + "projectID": 237307, + "fileID": 4600191, + "required": true + }, + { + "projectID": 401648, + "fileID": 4863626, + "required": true + }, + { + "projectID": 266890, + "fileID": 4994127, + "required": true + }, + { + "projectID": 357540, + "fileID": 4699629, + "required": true + }, + { + "projectID": 665658, + "fileID": 5012164, + "required": true + }, + { + "projectID": 328085, + "fileID": 4835191, + "required": true + }, + { + "projectID": 404465, + "fileID": 4864329, + "required": true + }, { "projectID": 256717, "fileID": 4614555, "required": true + }, + { + "projectID": 714158, + "fileID": 4987747, + "required": true + }, + { + "projectID": 367706, + "fileID": 4776833, + "required": true + }, + { + "projectID": 257814, + "fileID": 5005088, + "required": true + }, + { + "projectID": 636608, + "fileID": 4982660, + "required": true + }, + { + "projectID": 551894, + "fileID": 4688940, + "required": true + }, + { + "projectID": 433760, + "fileID": 5008760, + "required": true + }, + { + "projectID": 429371, + "fileID": 4884096, + "required": true } ], "overrides": "overrides" diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index 13b722f1e..9b735551d 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,108 +1,109 @@  diff --git a/CHANGELOG.md b/CHANGELOG.md index e3a1a3c0b..67418e550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog -## [Unreleased] +## [0.5.1] - 12.01.2024 ### Изменения - Исправлен квест на наковальни. - Исправлены рецепт золотого и медного слитков (используются на данный момент из ваниллы). - Исправлены рецепты мясницких ножей. +### Обновленные моды +- modernfix -> 5.12.0 ## [0.5.0] - 12.01.2024 ### Изменения From 795e3620b654699c1dac3273f934cea64a76374f Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 07:26:33 +0500 Subject: [PATCH 03/12] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ec7432616..8318ee425 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -301,8 +301,8 @@ jobs: close-fixed-issues: name: Close Fixed Issues - runs-on: ubuntu-latest needs: [modpack-info, release-github, release-curseforge] + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4.1.1 From 9ab75101a0822443386e1a5d4339e482d21c29bd Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 07:50:28 +0500 Subject: [PATCH 04/12] workflows --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 63 ++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8318ee425..12e13dc19 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -307,7 +307,7 @@ jobs: - name: Checkout uses: actions/checkout@v4.1.1 - - name: close-fixed-in-dev + - name: Сlose fixed in dev uses: juraj-hrivnak/close-issues-based-on-label@master env: LABEL: "2. Status: Fixed in Dev" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e8270f0bd..5972979b3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,8 +3,9 @@ run-name: "Release #${{ github.run_number }}" on: push: - tags: - - "test" + # push: + # tags: + # - "test" concurrency: @@ -20,36 +21,36 @@ env: PROJECT_VERSION: "0.5.0" jobs: - discord-message: - name: Discord Message - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 + # discord-message: + # name: Discord Message + # runs-on: ubuntu-latest + # steps: + # - name: Checkout + # uses: actions/checkout@v4.1.1 - - name: Changelog Parser - id: changelog - uses: coditory/changelog-parser@v1.0.2 - with: - path: CHANGELOG.md + # - name: Changelog Parser + # id: changelog + # uses: coditory/changelog-parser@v1.0.2 + # with: + # path: CHANGELOG.md - - name: Send Discord message - uses: tsickert/discord-webhook@v5.4.0 - with: - webhook-url: ${{secrets.RELEASES_1_20}} - username: "TerraFirmaGreg" - avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge.png" - embed-title: Release ${{ env.PROJECT_VERSION }} - embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ env.PROJECT_VERSION }} - embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png - embed-description: | - **Release Type**: `${{ env.RELEASE_TYPE }}` - **GameVersion**: `${{ env.MC_VERSION }}` - **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/${{ env.CF_RELEASE_ID }}) + # - name: Send Discord message + # uses: tsickert/discord-webhook@v5.4.0 + # with: + # webhook-url: ${{secrets.RELEASES_1_20}} + # username: "TerraFirmaGreg" + # avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge.png" + # embed-title: Release ${{ env.PROJECT_VERSION }} + # embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ env.PROJECT_VERSION }} + # embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png + # embed-description: | + # **Release Type**: `${{ env.RELEASE_TYPE }}` + # **GameVersion**: `${{ env.MC_VERSION }}` + # **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/${{ env.CF_RELEASE_ID }}) - **Changelog** - ```${{ steps.changelog.outputs.description }}``` - embed-color: 5814783 + # **Changelog** + # ```${{ steps.changelog.outputs.description }}``` + # embed-color: 5814783 close-fixed-issues: name: Close Fixed Issues @@ -58,8 +59,8 @@ jobs: - name: Checkout uses: actions/checkout@v4.1.1 - - name: close-fixed-in-dev - uses: juraj-hrivnak/close-issues-based-on-label@master + - name: Сlose fixed in dev + uses: bdougie/close-issues-based-on-label@v1.2 env: LABEL: "2. Status: Fixed in Dev" VERSION: ${{ env.PROJECT_VERSION }} From 0271b11577061f2b4e1787935684ed8248d30a3c Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 07:53:55 +0500 Subject: [PATCH 05/12] Update test.yml --- .github/workflows/test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5972979b3..b5c8b4bb3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -60,10 +60,9 @@ jobs: uses: actions/checkout@v4.1.1 - name: Сlose fixed in dev - uses: bdougie/close-issues-based-on-label@v1.2 + uses: lowply/auto-closer@v0.0.6 env: - LABEL: "2. Status: Fixed in Dev" - VERSION: ${{ env.PROJECT_VERSION }} + AC_LABEL: "2. Status: Fixed in Dev" GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 680b21dfc78f2880d6a04f8bf32cf12d6e80755b Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 07:55:47 +0500 Subject: [PATCH 06/12] Update test.yml --- .github/workflows/test.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b5c8b4bb3..87bc39675 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,5 @@ -name: Release -run-name: "Release #${{ github.run_number }}" +name: Test +run-name: "Test #${{ github.run_number }}" on: push: @@ -56,9 +56,6 @@ jobs: name: Close Fixed Issues runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: Сlose fixed in dev uses: lowply/auto-closer@v0.0.6 env: From e7b98b256c21d8065486ba372ea17c038b31afa2 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 07:59:11 +0500 Subject: [PATCH 07/12] Update test.yml --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 87bc39675..fa499f12c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,6 +56,9 @@ jobs: name: Close Fixed Issues runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + - name: Сlose fixed in dev uses: lowply/auto-closer@v0.0.6 env: From 829c7d6489a39b43ffbc94bd1f05bfe424466b4f Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 08:05:35 +0500 Subject: [PATCH 08/12] Update test.yml --- .github/workflows/test.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fa499f12c..8de6cf07b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,6 +3,8 @@ run-name: "Test #${{ github.run_number }}" on: push: + branches: + - main # push: # tags: # - "test" @@ -58,12 +60,20 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4.1.1 - + - name: Сlose fixed in dev - uses: lowply/auto-closer@v0.0.6 - env: - AC_LABEL: "2. Status: Fixed in Dev" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + issues=$(curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/issues?state=open") + + if echo "${labels}" | jq -e '.[].name | select(. == "2. Status: Fixed in Dev")' > /dev/null; then + curl \ + -X PATCH \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ + "https://api.github.com/repos/${{ github.repository }}/issues/${issue}" \ + -d '{"state": "closed"}' + fi + done From 63823417159cda6fca0e1ba474cbbe92c516528d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 08:07:32 +0500 Subject: [PATCH 09/12] Update test.yml --- .github/workflows/test.yml | 77 +++++++------------------------------- 1 file changed, 14 insertions(+), 63 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8de6cf07b..6d40abc50 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,79 +1,30 @@ -name: Test -run-name: "Test #${{ github.run_number }}" - +name: Close Fixed Issues on: push: branches: - main - # push: - # tags: - # - "test" - - -concurrency: - group: ${{ github.ref }} - cancel-in-progress: true - -env: - CF_PROJECT_ID: "385053" - CF_RELEASE_ID: "5025212" - MODRINTH_PROJECT_ID: "75JuuMzk" - RELEASE_TYPE: "BETA" - MC_VERSION: "1.20.1" - PROJECT_VERSION: "0.5.0" jobs: - # discord-message: - # name: Discord Message - # runs-on: ubuntu-latest - # steps: - # - name: Checkout - # uses: actions/checkout@v4.1.1 - - # - name: Changelog Parser - # id: changelog - # uses: coditory/changelog-parser@v1.0.2 - # with: - # path: CHANGELOG.md - - # - name: Send Discord message - # uses: tsickert/discord-webhook@v5.4.0 - # with: - # webhook-url: ${{secrets.RELEASES_1_20}} - # username: "TerraFirmaGreg" - # avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge.png" - # embed-title: Release ${{ env.PROJECT_VERSION }} - # embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ env.PROJECT_VERSION }} - # embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png - # embed-description: | - # **Release Type**: `${{ env.RELEASE_TYPE }}` - # **GameVersion**: `${{ env.MC_VERSION }}` - # **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/${{ env.CF_RELEASE_ID }}) - - # **Changelog** - # ```${{ steps.changelog.outputs.description }}``` - # embed-color: 5814783 - - close-fixed-issues: - name: Close Fixed Issues + closeIssues: runs-on: ubuntu-latest + steps: - name: Checkout uses: actions/checkout@v4.1.1 - - name: Сlose fixed in dev + - name: Close Fixed Issues run: | - issues=$(curl -s -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/issues?state=open") - - if echo "${labels}" | jq -e '.[].name | select(. == "2. Status: Fixed in Dev")' > /dev/null; then - curl \ + issues=$(curl -s -H "Authorization: ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/TerraFirmaGreg-Team/Modpack-1.20.x/issues?state=open") + + for issue in $(echo "${issues}" | jq -r '.[].number'); do + labels=$(curl -s -H "Authorization: ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/TerraFirmaGreg-Team/Modpack-1.20.x/issues/${issue}/labels") + + if echo "${labels}" | jq -e '.[].name | select(. == "2. Status: Fixed in Dev")' > /dev/null; then + curl \ -X PATCH \ -H "Accept: application/vnd.github.v3+json" \ - -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ - "https://api.github.com/repos/${{ github.repository }}/issues/${issue}" \ + -H "Authorization: ${{ secrets.GITHUB_TOKEN }}" \ + "https://api.github.com/repos/TerraFirmaGreg-Team/Modpack-1.20.x/issues/${issue}" \ -d '{"state": "closed"}' fi - done - - - + done \ No newline at end of file From f6f0c9d225cd9bda3f4b43d06ea2bf6f0903cd6d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 08:15:43 +0500 Subject: [PATCH 10/12] workflows --- .github/workflows/release.yml | 26 +++++++++++++------------- .github/workflows/test.yml | 30 ------------------------------ 2 files changed, 13 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12e13dc19..fb5db2ccb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -299,20 +299,20 @@ jobs: ```${{ needs.modpack-info.outputs.changelog }}``` embed-color: 5814783 - close-fixed-issues: - name: Close Fixed Issues - needs: [modpack-info, release-github, release-curseforge] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 + # close-fixed-issues: + # name: Close Fixed Issues + # needs: [modpack-info, release-github, release-curseforge] + # runs-on: ubuntu-latest + # steps: + # - name: Checkout + # uses: actions/checkout@v4.1.1 - - name: Сlose fixed in dev - uses: juraj-hrivnak/close-issues-based-on-label@master - env: - LABEL: "2. Status: Fixed in Dev" - VERSION: ${{ needs.modpack-info.outputs.project_version }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Сlose fixed in dev + # uses: juraj-hrivnak/close-issues-based-on-label@master + # env: + # LABEL: "2. Status: Fixed in Dev" + # VERSION: ${{ needs.modpack-info.outputs.project_version }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 6d40abc50..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Close Fixed Issues -on: - push: - branches: - - main - -jobs: - closeIssues: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - - name: Close Fixed Issues - run: | - issues=$(curl -s -H "Authorization: ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/TerraFirmaGreg-Team/Modpack-1.20.x/issues?state=open") - - for issue in $(echo "${issues}" | jq -r '.[].number'); do - labels=$(curl -s -H "Authorization: ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/TerraFirmaGreg-Team/Modpack-1.20.x/issues/${issue}/labels") - - if echo "${labels}" | jq -e '.[].name | select(. == "2. Status: Fixed in Dev")' > /dev/null; then - curl \ - -X PATCH \ - -H "Accept: application/vnd.github.v3+json" \ - -H "Authorization: ${{ secrets.GITHUB_TOKEN }}" \ - "https://api.github.com/repos/TerraFirmaGreg-Team/Modpack-1.20.x/issues/${issue}" \ - -d '{"state": "closed"}' - fi - done \ No newline at end of file From 677b5d41575edf4a5904cb138b2a7016b4421e42 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 08:17:32 +0500 Subject: [PATCH 11/12] buildtools --- .github/buildtools/modpack/instance.cfg | 1 - .github/workflows/release.yml | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/buildtools/modpack/instance.cfg b/.github/buildtools/modpack/instance.cfg index 8d3854833..549c48175 100644 --- a/.github/buildtools/modpack/instance.cfg +++ b/.github/buildtools/modpack/instance.cfg @@ -5,7 +5,6 @@ iconKey=icon ManagedPackID=385053 ManagedPackType=flame ManagedPackName=TerraFirmaGreg-1.20.x -ManagedPackVersionID=CF_RELEASE_ID ManagedPackVersionName=DEV name=TerraFirmaGreg-1.20.x InstanceType=OneSix diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb5db2ccb..803faeb91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,7 +96,7 @@ jobs: build-mmc-modpack: name: Build MMC Modpack runs-on: ubuntu-latest - needs: [modpack-info, release-curseforge] + needs: [modpack-info] steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -105,11 +105,9 @@ jobs: shell: bash run: | VERSION=${{ needs.modpack-info.outputs.project_version }} - CF_RELEASE_ID=${{ needs.release-curseforge.outputs.cf_release_id }} sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/instance.cfg sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/main_menu.txt sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml - sed -i -e "s/CF_RELEASE_ID/${CF_RELEASE_ID}/g" .github/buildtools/modpack/instance.cfg - name: Download Mods run: | From 2076053aeb481aa03239005b57857dce7bc8b167 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 12 Jan 2024 08:35:30 +0500 Subject: [PATCH 12/12] main_menu --- config/fancymenu/customization/main_menu.txt | 51 +++++++++++++++++- .../assets/minecraft/textures/gui/slider.png | Bin 3121 -> 0 bytes .../assets/minecraft/textures/gui/widgets.png | Bin 13245 -> 0 bytes kubejs/assets/tfg/textures/gui/button.png | Bin 0 -> 230 bytes .../assets/tfg/textures/gui/button_100x20.png | Bin 0 -> 215 bytes .../assets/tfg/textures/gui/button_hover.png | Bin 0 -> 224 bytes .../tfg/textures/gui/button_hover_100x20.png | Bin 0 -> 215 bytes 7 files changed, 49 insertions(+), 2 deletions(-) delete mode 100644 kubejs/assets/minecraft/textures/gui/slider.png delete mode 100644 kubejs/assets/minecraft/textures/gui/widgets.png create mode 100644 kubejs/assets/tfg/textures/gui/button.png create mode 100644 kubejs/assets/tfg/textures/gui/button_100x20.png create mode 100644 kubejs/assets/tfg/textures/gui/button_hover.png create mode 100644 kubejs/assets/tfg/textures/gui/button_hover_100x20.png diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt index 4241064e6..2e3a80154 100644 --- a/config/fancymenu/customization/main_menu.txt +++ b/config/fancymenu/customization/main_menu.txt @@ -41,6 +41,15 @@ customization { height = 20 } +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_multiplayer_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = kubejs/assets/tfg/textures/gui/button_hover_100x20.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_100x20.png +} + customization { identifier = %id=button_compatibility_id:mc_titlescreen_accessibility_button% action = hidebutton @@ -75,6 +84,15 @@ customization { y = -5 } +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_options_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = kubejs/assets/tfg/textures/gui/button_hover_100x20.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_100x20.png +} + customization { identifier = %id=button_compatibility_id:mc_titlescreen_quit_button% orientation = mid-centered @@ -83,6 +101,15 @@ customization { y = 18 } +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_quit_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = kubejs/assets/tfg/textures/gui/button_hover_100x20.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_100x20.png +} + customization { identifier = %id=button_compatibility_id:mc_titlescreen_language_button% action = hidebutton @@ -104,6 +131,15 @@ customization { y = -51 } +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_singleplayer_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = kubejs/assets/tfg/textures/gui/button_hover.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button.png +} + customization { identifier = %id=button_compatibility_id:forge_titlescreen_mods_button% orientation = mid-centered @@ -112,6 +148,15 @@ customization { y = -5 } +customization { + identifier = %id=button_compatibility_id:forge_titlescreen_mods_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = kubejs/assets/tfg/textures/gui/button_hover_100x20.png + backgroundnormal = kubejs/assets/tfg/textures/gui/button_100x20.png +} + customization { identifier = %id=button_compatibility_id:mc_titlescreen_realms_button% action = hidebutton @@ -195,15 +240,17 @@ customization { customization { orientation = mid-centered - loopbackgroundanimations = true restartbackgroundanimations = true buttonaction = joinserver;tfg2.terrafirmagreg.su%btnaction_splitter_fm% + backgroundhovered = kubejs/assets/tfg/textures/gui/button_hover_100x20.png + label = Offical Server + loopbackgroundanimations = true x = 47 width = 98 action = addbutton actionid = 6514e312-8243-47af-a516-89743d8ca1af1699692677651 y = -28 - label = Offical Server + backgroundnormal = kubejs/assets/tfg/textures/gui/button_100x20.png height = 20 } diff --git a/kubejs/assets/minecraft/textures/gui/slider.png b/kubejs/assets/minecraft/textures/gui/slider.png deleted file mode 100644 index c4395aac0f1f725e05f4ef3c7b4cdd5606eaf054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3121 zcmeHJTWl0n7@jJDauWoM#6X-3iWoUN_niw}YTE_d$Sw_CQyK|)=FFMxgx#5CX4>6? z%0-igh#|g!QG_Q!cz}Q!P)USh=tDJxXdng%H9QakUXUP(f#BIIw-y%Si;0`FnKNhp z|NH;{JO4Ll*0;uA89(NkF%(6OZ)uJ$qNo}&t)Xg1lFJhBGmBhCXPP^FiW)mP|F5Aw z+A@`*M*U_d76*%C3v}eBL(p^$9Ll9L#G0b&>T?;0mg9gnaME@n%ESt?{Ls>E8dP$boG>zp1RuBNO0Dg}Xz#MS=8D)eh_K|020^4=yJR&sQ zt{}pYREssFGZk3JFY!beV{WiAhw!{^lIDzjH5t9h z!!U5YgzKitJJniFnHHpwLeFZq9n;PFFW%;WqcFe`hU}UII393nf>U%!)j9DcPS!cD zXc}`(+v>T?R7(h=PKGGlVM=<&gaLe@v59oc_0o_OY^Pxovl%DJ&=nf>CO74JBrwTN zEMyUj=`D^QKnLNLXoMj(hiu!_Ra3-*1Qj4yf&vsIDL~bD3s}%nOrEzy%RpuSsEfMt zJ6rZQiN9zBok<&ECEFkOaqx=9$UDM%}awo z6je7YR+v{Uh!F%P(!xMdB?wee;DH=Qh9WD9j8x%XtUUeI(l@+!SQQa(Ar(lR!~+XU z9DuwW2C`%th9p}SCtA087b+^!!`>oeC>{&K)0^!)uRSFO+VF}B7j!{uIz;(*NQ6Oo z@nDlFE!#u%S#^CEfx*}mS{sF zx8>K{r@VZeZJcu;06#RQQLgsLspijHzkGG!;VJ9k^YIU)?Q2%WKmBuO?&;@h z51#pYH`>65HV+I?N2j9iuUtQPb=+CFfA_@$OG509A1}Oh5e_cha_oF>nUpPF-jv1&w8l%>1z0tpM|9+)??Jt}A`}@CpZO|S!Fk$tsOYc5hjQ5Xg zZ&NpS?VB85*YIIGReS2}^}l9O+a|TIt=~$`uD>4IJ9%jhy@0BAT$(|xKR4=+XD7{B svFgcLmwVSPd?@$o1O0FLA7$XusDQWN*fY6E{-eHSUOc+H@r`x=0Nu8PlK=n! diff --git a/kubejs/assets/minecraft/textures/gui/widgets.png b/kubejs/assets/minecraft/textures/gui/widgets.png deleted file mode 100644 index 73e2c6440767bdd5b3434ca55de78836ad4ceafa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13245 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
o>PcgKrGu_&q&JyYzwA-Ob|wQ$R| zac5MF!Db~A{^iBBtw@wlNUpZu&VtODL_EuNLU!oQOfm>gSm3be<9Q9?DQmE)(&jmIRn*MTj_^4KiBX{4pLXFkPHh~JC2mTyC=QP zzB?U3*;HfXAAL8M<}4~9`%^ZZH8knRl;_yO&O(T?EO)33TrpL9p~v=WEC+RCXNc3O;lbrW`Dpg>npO$Q(Bm1l zvxZ~!gglN(B0!r9$Qm=(eS&IvaqaZ3fK%X^E@$I=>xbl&lx^PT>$&$>4`t-Txnd$Y zP8)8pcFf8E^o*rO*#~`gl{sBooB2tssx+Y^*JUE8Ro2_c*<>V&sI=87FU3^GH!oBS z4mv{T6$Ivfe%md&UAb15efX_1ZreBW=q>1k>A{EHNTw?QbI8h<3h$}+f`S}VB?fvR zEw|%+_t&xX(EU=)rLGj>kmiB zHcV_9mJ_Ng`41?YcDHF)UE@oDw`k~DDP2xc0hClOGMIbOGFsn6s|3pO@PkepkbQa- zl`u6n4D*WLJvnD~GONWYzxitxYvY~g7n;+ge5C5>p0%kRg|yN4_L9L zlDG2mqS2v2b%ezXE3kU?3hAnKw>^^t1O<4gB4)DB<`y`lz83kfZ9do-Eg^o6K4xfa z9EO>B&lQ04gWf?!RQq7g@iFB2@lL#3jeB&aiBhC_(!2!b#bvgzOR6c9pVU}GS$ZO4 z9_Va)6l7F`lT8Mwm8foJi0Agk3w2m|9Q=H<4ZM)y!3a`xgdvjITo|J!?Mm*lfg1eu ziH5loBafXc5xb*KtouPpcOb*JyN!ySCbqgF=Q7IgCUc{})#&*-;-o~>f zKUkqwbq%^-860C&2SKt2^ghl|*iI^1JGA%zh;LLXsTkVib9C=ZR(95yNVu=ZkHuhd z_igFbgC+lTTq~Ggs+np-Lnk|@-kcl-rxFa_(vbDpA5hGCZ%t1KrbE_WfpuLk<}D-# zFXEL0ZW=jMXHi*R{Sb-+)-!z;dIt4L7gG`)8gK5k)yZKvyJW7glJ}=t8KzGweU@qa@#pxX@p3imCD|G9x*Wwcl z%eU=dJnlqyd%qLmB=EaaIkuD<9>bni_{EeJDNZ=8wD{<1Y(#ij6zK+@rQ5&~K@#pt zI?1=x`_uSaddFCvu!@x7M9=iyt;`XNn!7veuKnmrd+wq4TB7IIi>3u4_a(k4?XKW(e?1i!j}i zOP{)=VE$wgFJTWClkQa;fq|#zN}BXQm$j4o5kx%hn&`TvT+9?X(Ie}G2z5ubGmdh3 zIoyX6>L?Z=kD9 zsm_eGYyBg2dwLlDCd+9+qjVy-Y_*XheN=jwHF}W{<`)7GwztZrdz2-i!)2?rBNJIe ziSiaI3HXv;Ny>Zm<|nan@M;xlM3_lmjuwItVI6Om=reYy);R3TAY$@DVtVx9&7+CU z^4ET_t-~E3ksCi~8pX!CKX!LP4!?TiV4Q*CC;aZhTPwxV_|)Obrm%T(OM8oiT?l&xHRqb?$0m{!f-IMwxPMQTh0d|_XSdL znBX~c;6g;6w(IoT=js`fff0Jrt})<6j1f<=Agx1_z7lh`BE zUayKTFvri>Q|1|6vmHGH?^;g-=%W?{zCW4z73Uf>^I9wD2X(Bc1zi3#=l-LsCtGHv zyP?%apPB=~>nSg86g!kPWFJEXZLPoDr2w}hqfR7{3_aPW1}@xn5@tN4a|P;jTj*Dw zY>}{oH?ZI9`3;^M-2q$LS0;RG5E%P%Z1qUs-p^n?80uNP8e6mM0G<3bG#n8r-a&7= z_c;4_*1Ln=Fy`CJlw=*)QqEh?u}2FLn?~YYfV#)$1RvlNQLLgLhr`>)@0Xj_hRkX7 zx}mM)Va(!gR%5pe&38uAFGe9I`D5ea%DW?|rk@={KlGo^8?e5$R>yEgGb<2=Aw0+! zfbcF97JzYdCPEPZ=48;yXt^Z=6O*ZDApv`IEww*4EblhneC|F(t}j)ROD3_D*zfyY zx-2ybShzSok{#O7+3D*%`Szeyh>uL}t-0S)LF%ddOh??pTe_BbR;l{iTl4*tE}yHu zYxK&)U71b~$C~Hg!G?GMxmkKa0Q%6T3xF%ev*XLcC8Egw-O1c=1oT6Mv~T0idmh3}5V&s63X{ zy+8)unNOLhEBJHgslpd7Tmd8xW*^H0OdU=7j_EQU?o@`J+ zgTbchhOb;)oNfV1S76rKUJT$en{h4S*h%fw%)n^!o0r~~fob3Cp<}~B2#|$5S26%N z^%^%go_L~TcJQvuZ#zz5vp4h**ce@c$04HUYz^?Ma`E2YKJ)Zjecv`sDMJX@k23C$ z2e7n=-MkkBmAl6Ik{{n?Kf8H2ROM_NB78dzM;8ss-I?JJs8|N!0~;nYG&d)G2y7=M z2`ep3eOh7RMj`cNEuf^Nviv)Bl_!Qki&oQFw!2kh%Ly+h(Bif4aftDX9ktxFM#9k6YAXbA}Qsz_K0(X+K5d$vu zWMPaaYTd*?z7_QXi9e_nLlznE#i_&LQ1?TOe6$=bG}i=xx~Jsc#*0r#SO?9ie<2nz zAWdjYBTT16L;S-`{ymUlb}{JO@6N6DJe-)l{pUnOrR7W8{zptlvsY!(ADApd-7928 zAjBM<+x^hD8}CThGs~__Zw<<5HD3W4LrIa#njF}b5yPe}1o5EmyB~1?I=Q*KIX+uv zUyjDP?u0t~Op3p8TlajG;tx#PnzCSS(5FrW)5Hk$5||u*6Zm7=92K^Z9eR2Q`oW@w zRfq`0fjAK{V37iX|0%cZu{U0m0M6oMLBpW0q8mm z=kj{QX5qyqB!u4PCU^e!2DOzQ6MLb3ob5_v%l`iUA3mEDWdS;0sJ{C3#a+;Fte-#R ztNf8f$eBd1)m1kJ?zvbthnz5xI=DJHt#a?|?XHcxZ!hYcv|R$jw_u795skwRDCWEh z|M{(sdQkdkwIxJC^>y&ZwA|;KxZ4$Vgp`sSEqV^1Keun9R(fUC<<1@bYL*|Kp_x0u zvH+=)WLu+f5X8+#XroRS!n>-N<2$;3cAtO+b6S%wDT4CO> zk+~j3l&ns`cF?6lXbVl+EE@!)bB~{wh9tuN2_o7bSw^&RG!udmN5SgecctM^33It8;hvTBz&JT0?Hu4UY{ znPn%SapeenFNi%R?{c=^(e9d5a}j`$%a8`+)@xR#@b*Bn=fXhIyb0CfhnsX;4);Kh z&aEVJTO48+W+Vr%4?OB(OG>!)d1#?>U_~L&nF9pYE z&+VrD2NwYV*cO09cnzKp7tIhl zU*&35;O&Afk#Ot1pA%!1#xHHV<4Uq=O;rO^%{;mrm)Fm$v#`O^rN8{0*^XMF4DF#c|Y#O)_ayXnl5F`W2IA-o^K7X_gmP~l>4J~}Q z%E?G);Pn~^;PdmF|GJ9I;RoYnk;e8hoAI~fpcVado`ivQ^*18=QesuGusY&hP>j$0 zuhWG^kT>9g9MKDYnPQ*wIMi3lk)zpAZEleH9hZc~m*~MNEkz*iHr-O2@^J`^4xwzK z3066H#64nmaPp41p}F^n=?w>aCnu+VaJd=JYI=sU0r>dx9kT#+kVTaK*+BL z&7jurQL;5DoHPa>`5Z4BHrGo`OtwZ4onhcFsKACMqwb9Z!9<W}mF~ z{}(&>2!bZa)CLkkNHF!HHz{)#fUH}g`))q6&K<2f3Q(gx~W(pZx#N30CVtr{{R30 diff --git a/kubejs/assets/tfg/textures/gui/button.png b/kubejs/assets/tfg/textures/gui/button.png new file mode 100644 index 0000000000000000000000000000000000000000..1106ec6d36486ec8ca68f137756913f018dfe3c4 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^CxBRlgAK%5QgjMPaTa()7Bet#3xhBt!>lak*Gn5#hc->~xdCG*;Eq4pX!;Cw-3Iy+iz<$@)3DYp1HrES6)O zq_TEv`J|lewP!5*@BM!MF7Sg$a!+{n+r4w2SAMx?|9jv4y_|B7cdhF&jEgVlZ&VlN z5Mg0rZFF!{2oS)-Y}fp8{C(o7r(*wp?YvXRe85Q0mHX)aM?g0+c)I$ztaD0e0sxp& BP_6&~ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/gui/button_100x20.png b/kubejs/assets/tfg/textures/gui/button_100x20.png new file mode 100644 index 0000000000000000000000000000000000000000..28a1cd8aaac8f46f808df4021556a36f20d0fa42 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^sX#2k!3HF!FnwMPq&N#aB8wRqxP?KOkzv*x37}x7 zr;B4qMC;p|hJptSc$@>5YHYf(qDxhwY3YhLsycU8#&Rj_S}n(P_iy0ZRSXO>Efu3@ z-ehP93q5h><-608B{$ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/gui/button_hover.png b/kubejs/assets/tfg/textures/gui/button_hover.png new file mode 100644 index 0000000000000000000000000000000000000000..f8f329e6190a1d5f7adab77456c4703ab08c1562 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^CxBRlgAK%5QgjMPaTa()7Bet#3xhBt!>lqA0y_VX*axg4qf zdu2}X{*MwBQ_igEkXXDb>)g)#+hyNzopr009z5I{*Lx literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/gui/button_hover_100x20.png b/kubejs/assets/tfg/textures/gui/button_hover_100x20.png new file mode 100644 index 0000000000000000000000000000000000000000..1e193210531b13e556848d72222ced83e5e8c643 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^DL^d3!3HF&56qYfq&N#aB8wRqxP?KOkzv*x37}x7 zr;B4qMC;p|8+i{q@Hhu*oe?1q zzW)p?k8eJ1Bj?GuV$za#`>sV@Hn+WXPg>>u^)HGa^&QWsbj)NioUD*0bi}7=hNplr yXObG4;L6PsX$z#>J{^->u`hpSLAoeI4a3=Lh1!T2*Ajq^V(@hJb6Mw<&;$Srg-yNy literal 0 HcmV?d00001