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/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/.github/workflows/release.yml b/.github/workflows/release.yml index ec7432616..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: | @@ -299,20 +297,20 @@ jobs: ```${{ needs.modpack-info.outputs.changelog }}``` embed-color: 5814783 - close-fixed-issues: - name: Close Fixed Issues - runs-on: ubuntu-latest - needs: [modpack-info, release-github, release-curseforge] - 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: close-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 e8270f0bd..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,69 +0,0 @@ -name: Release -run-name: "Release #${{ github.run_number }}" - -on: - 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 - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - - name: close-fixed-in-dev - uses: juraj-hrivnak/close-issues-based-on-label@master - env: - LABEL: "2. Status: Fixed in Dev" - VERSION: ${{ env.PROJECT_VERSION }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - 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 ### Изменения 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 c4395aac0..000000000 Binary files a/kubejs/assets/minecraft/textures/gui/slider.png and /dev/null differ diff --git a/kubejs/assets/minecraft/textures/gui/widgets.png b/kubejs/assets/minecraft/textures/gui/widgets.png deleted file mode 100644 index 73e2c6440..000000000 Binary files a/kubejs/assets/minecraft/textures/gui/widgets.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/gui/button.png b/kubejs/assets/tfg/textures/gui/button.png new file mode 100644 index 000000000..1106ec6d3 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/button.png differ 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 000000000..28a1cd8aa Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/button_100x20.png differ 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 000000000..f8f329e61 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/button_hover.png differ 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 000000000..1e1932105 Binary files /dev/null and b/kubejs/assets/tfg/textures/gui/button_hover_100x20.png differ diff --git a/mods b/mods index 3524d97fe..7b6f294a1 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 3524d97fe8e67c03c0dd3cfe96feb51abc92beb8 +Subproject commit 7b6f294a14fd065e2b64ee1988db4d9ff912cf63