diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c6458772..ce04c365c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -505,7 +505,7 @@ jobs: name: 🚀 Release to Modrinth needs: [info, build-project, release-github] runs-on: ubuntu-latest - if: false + if: ${{ needs.info.outputs.make_release == 'true' }} outputs: id: ${{ steps.release.outputs.id }} @@ -529,9 +529,6 @@ jobs: if [ ! -f ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack ]; then echo '::error::No value found for artifact `modrinth.mrpack`.' && exit 1 fi - if [ ! -f ${{ needs.info.outputs.project_full_name }}-serverpack.zip ]; then - echo '::error::No value found for artifact `serverpack.zip`.' && exit 1 - fi echo "✔️ All artifacts found" - name: 🚀 Upload Modrinth @@ -541,12 +538,11 @@ jobs: api-token: ${{ secrets.MODRINTH_TOKEN }} project-id: ${{ vars.MODRINTH_ID }} modpack-path: ${{ needs.info.outputs.project_full_name }}-modrinth.mrpack - modpack-server-path: ${{ needs.info.outputs.project_full_name }}-serverpack.zip changelog: ${{ needs.info.outputs.changelog }} changelog-format: markdown game-version: ${{ needs.info.outputs.mc_version }} display-name: ${{ needs.info.outputs.project_full_name }} - server-display-name: ${{ needs.info.outputs.project_full_name }}-serverpack + release-type: ${{ needs.info.outputs.release_type }} discord-message: diff --git a/config/mod-director/ftb.bundle.json b/config/mod-director/ftb.bundle.json new file mode 100644 index 000000000..c188bdec5 --- /dev/null +++ b/config/mod-director/ftb.bundle.json @@ -0,0 +1,40 @@ +{ + "curse": [ + { + "addonId": 289412, + "fileId": 6829212 + }, + { + "addonId": 404468, + "fileId": 6130786 + }, + { + "addonId": 314906, + "fileId": 6431735 + }, + { + "addonId": 404465, + "fileId": 6807424 + }, + { + "addonId": 314905, + "fileId": 6522073 + }, + { + "addonId": 943925, + "fileId": 6466153 + }, + { + "addonId": 889915, + "fileId": 6402486 + }, + { + "addonId": 410811, + "fileId": 6555287 + }, + { + "addonId": 622737, + "fileId": 4834403 + } + ] +} \ No newline at end of file diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json index db393cd4d..76801ed2f 100644 --- a/config/xaerominimap_entities.json +++ b/config/xaerominimap_entities.json @@ -10,8 +10,8 @@ "name": "gui.xaero_entity_category_root", "protection": true, "settingOverrides": { - "displayHeight": 0.0, "displayed": true, + "displayHeight": 0.0, "heightBasedFade": true, "renderOrder": 0.0, "color": 13.0, @@ -22,8 +22,8 @@ "startFadingAt": 0.0, "renderOverMinimapFrame": 1.0, "icons": 1.0, - "heightLimit": 20.0, "names": 0.0, + "heightLimit": 20.0, "iconScale": 1.0 }, "subCategories": [ diff --git a/pakku-lock.json b/pakku-lock.json index 8f35668c7..15b258358 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -1454,6 +1454,70 @@ } ] }, + { + "pakku_id": "xYgkxAJKwHb9tvUM", + "type": "MOD", + "side": "BOTH", + "slug": { + "curseforge": "autopack-director", + "modrinth": "autopack-director" + }, + "name": { + "curseforge": "AutoPack-Director", + "modrinth": "AutoPack-Director" + }, + "id": { + "curseforge": "1182657", + "modrinth": "Fqqapnbs" + }, + "files": [ + { + "type": "curseforge", + "file_name": "AutoPack-Director-1.0.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "beta", + "url": "https://edge.forgecdn.net/files/6102/172/AutoPack-Director-1.0.1.jar", + "id": "6102172", + "parent_id": "1182657", + "hashes": { + "sha1": "973a115aeee0cd6d40ad0a0e1e255d5aa0419bb2", + "md5": "5b6d859ea086f988ed041045d0b58896" + }, + "required_dependencies": [], + "size": 3031600, + "date_published": "2025-01-19T07:37:46.543Z" + }, + { + "type": "modrinth", + "file_name": "Modpack-Director-1.0.1.jar", + "mc_versions": [ + "1.12.2", + "1.20.1" + ], + "loaders": [ + "forge", + "neoforge" + ], + "release_type": "beta", + "url": "https://cdn.modrinth.com/data/Fqqapnbs/versions/47y19tCP/Modpack-Director-1.0.1.jar", + "id": "47y19tCP", + "parent_id": "Fqqapnbs", + "hashes": { + "sha512": "2a58aff6a3bbcc4e44f6b81f7fb8477fd87f55112ff53c3704ae25a136d2ffd5146043983cf653444e823a4c9a247866028a452ff482d9cdc6cb81af4a1ffca3", + "sha1": "973a115aeee0cd6d40ad0a0e1e255d5aa0419bb2" + }, + "required_dependencies": [], + "size": 3031600, + "date_published": "2025-01-19T06:45:11.832901Z" + } + ] + }, { "pakku_id": "tcGlxrXYONei6sfG", "type": "MOD", @@ -5378,7 +5442,7 @@ "e7thBe1Z6fvyxUtU" ], "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "ftb-backups-2" }, @@ -5388,6 +5452,7 @@ "id": { "curseforge": "622737" }, + "export": false, "files": [ { "type": "curseforge", @@ -5435,6 +5500,7 @@ "id": { "curseforge": "314906" }, + "export": false, "files": [ { "type": "curseforge", @@ -5475,6 +5541,7 @@ "id": { "curseforge": "410811" }, + "export": false, "files": [ { "type": "curseforge", @@ -5517,6 +5584,7 @@ "id": { "curseforge": "943925" }, + "export": false, "files": [ { "type": "curseforge", @@ -5560,6 +5628,7 @@ "id": { "curseforge": "404465" }, + "export": false, "files": [ { "type": "curseforge", @@ -5603,6 +5672,7 @@ "id": { "curseforge": "289412" }, + "export": false, "files": [ { "type": "curseforge", @@ -5647,6 +5717,7 @@ "id": { "curseforge": "314905" }, + "export": false, "files": [ { "type": "curseforge", @@ -5690,6 +5761,7 @@ "id": { "curseforge": "404468" }, + "export": false, "files": [ { "type": "curseforge", @@ -5735,6 +5807,7 @@ "id": { "curseforge": "889915" }, + "export": false, "files": [ { "type": "curseforge", @@ -6976,45 +7049,46 @@ "modrinth": "fUawEtti" }, "files": [ - { - "type": "curseforge", - "file_name": "GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.19.zip", - "mc_versions": [ - "1.20.1" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6546/954/GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.19.zip", - "id": "6546954", - "parent_id": "964322", - "hashes": { - "sha1": "b0e072c301f713e7e1c2cc21a75646e7d64051f6", - "md5": "d2a57f619ac14ffd8705596b56a6e599" - }, - "required_dependencies": [], - "size": 8116393, - "date_published": "2025-05-19T12:40:51.413Z" - }, { "type": "modrinth", - "file_name": "GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.19.zip", + "file_name": "[ver 0.20] GT Revival 32x 1.19.2-1.20.1-1.21.zip", "mc_versions": [ - "1.20", - "1.20.1" + "1.19.2", + "1.20.1", + "1.21.1" ], "loaders": [ "minecraft" ], "release_type": "release", - "url": "https://cdn.modrinth.com/data/fUawEtti/versions/UuwQOAHO/GregTech Revival 32x 1.19.2-1.20.1-1.21 ver 0.19.zip", - "id": "UuwQOAHO", + "url": "https://cdn.modrinth.com/data/fUawEtti/versions/oQJH7fHm/[ver 0.20] GT Revival 32x 1.19.2-1.20.1-1.21.zip", + "id": "oQJH7fHm", "parent_id": "fUawEtti", "hashes": { - "sha512": "0cede40c825cee8fd314abd9825b9e35f943aa5379fa6f81adc8643473c66cbef6a6ae846a546b8584514d857c21831d1bf81d6c6393fe7306dedd725c2570f1", - "sha1": "b0e072c301f713e7e1c2cc21a75646e7d64051f6" + "sha512": "d9834d62867186584f1a6b62d91f1426dd3ff646e5c85c2c562767db2b4616769640314d970e5550bcd3e5fc65be3eb733831503d607add010805c7d54949f32", + "sha1": "388145cb295a0778deb2af3920c3a53ecfb80804" }, "required_dependencies": [], - "size": 8116393, - "date_published": "2025-05-19T12:41:42.204377Z" + "size": 8289791, + "date_published": "2025-07-19T13:09:55.325382Z" + }, + { + "type": "curseforge", + "file_name": "[ver 0.20] GT Revival 32x 1.19.2-1.20.1-1.21.zip", + "mc_versions": [ + "1.20.1" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6787/476/[ver 0.20] GT Revival 32x 1.19.2-1.20.1-1.21.zip", + "id": "6787476", + "parent_id": "964322", + "hashes": { + "sha1": "388145cb295a0778deb2af3920c3a53ecfb80804", + "md5": "9c4fad9bba1ff5c4dd7c24d68c9310a9" + }, + "required_dependencies": [], + "size": 8289791, + "date_published": "2025-07-19T13:10:34.260Z" } ] }, @@ -10309,7 +10383,7 @@ "3Hn4sTVbBvKyQJJS" ], "type": "MOD", - "side": "CLIENT", + "side": "BOTH", "slug": { "curseforge": "pick-up-notifier", "modrinth": "pick-up-notifier" @@ -12122,21 +12196,23 @@ ] }, { - "pakku_id": "4WwQ11qPky8VtFcw", + "pakku_id": "EmmEeCWccT896XlZ", "pakku_links": [ - "F6H99cZ4H6jZRpEK", - "fMkiGcRPRv1DdRC1", "64uacGcEw697jVGs" ], "type": "MOD", + "side": "BOTH", "slug": { - "curseforge": "tfc-better-blast-furnace" + "curseforge": "tfc-better-blast-furnace", + "modrinth": "tfc-better-blast-furnace" }, "name": { - "curseforge": "TFC Better Blast Furnace" + "curseforge": "TFC Better Blast Furnace", + "modrinth": "TFC Better Blast Furnace" }, "id": { - "curseforge": "1046432" + "curseforge": "1046432", + "modrinth": "tr715LZ4" }, "files": [ { @@ -12161,6 +12237,27 @@ ], "size": 21088, "date_published": "2024-06-23T02:44:03.777Z" + }, + { + "type": "modrinth", + "file_name": "TFCBetterBlastFurnace-1.20.1-1.0.0.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/tr715LZ4/versions/kXi8g4JA/TFCBetterBlastFurnace-1.20.1-1.0.0.jar", + "id": "kXi8g4JA", + "parent_id": "tr715LZ4", + "hashes": { + "sha512": "d4c9d5fab5bffd67c8a14acffd13e9defa6e6cfa4bdff44c1d8021dce660d814b2e7352f43361a8118349d24b753b74af7921c4d111d998495ffd1d5afa99bd8", + "sha1": "91dbfe3c3e7e7fc9ffb126d879c1507e8c2f8b82" + }, + "required_dependencies": [], + "size": 21088, + "date_published": "2025-08-17T17:27:17.212986Z" } ] }, @@ -13405,6 +13502,66 @@ } ] }, + { + "pakku_id": "RVPHBXeZSGhgSPEu", + "type": "SHADER", + "side": "CLIENT", + "slug": { + "curseforge": "terrafirmagreg-shaders", + "modrinth": "terrafirmagreg-shaders" + }, + "name": { + "curseforge": "TerraFirmaGreg-Shaders", + "modrinth": "TerraFirmaGreg-Shaders" + }, + "id": { + "curseforge": "954161", + "modrinth": "cFPyBbB1" + }, + "files": [ + { + "type": "curseforge", + "file_name": "TerraFirmaGreg-Shaders-Unbound-2.0.1.zip", + "mc_versions": [ + "1.20.1" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6926/661/TerraFirmaGreg-Shaders-Unbound-2.0.1.zip", + "id": "6926661", + "parent_id": "954161", + "hashes": { + "sha1": "acacf78875b08aa2132abbb387ec4397a96711a3", + "md5": "26fb51631705d06253a4b5766121e2b9" + }, + "required_dependencies": [], + "size": 568225, + "date_published": "2025-08-25T13:12:54.383Z" + }, + { + "type": "modrinth", + "file_name": "TerraFirmaGreg-Shaders-Unbound-2.0.1.zip", + "mc_versions": [ + "1.12.2", + "1.20.1" + ], + "loaders": [ + "iris", + "optifine" + ], + "release_type": "release", + "url": "https://cdn.modrinth.com/data/cFPyBbB1/versions/7LqM8Hgz/TerraFirmaGreg-Shaders-Unbound-2.0.1.zip", + "id": "7LqM8Hgz", + "parent_id": "cFPyBbB1", + "hashes": { + "sha512": "c62a4f1efaec1d1a27f69ae485cb874fc9064fdfecfc2dcea8440f5d70ec0fd91f9c55fd7e42f118e57e36087b2987f2b3a20f757ec8c80943a55ab49dda9d77", + "sha1": "acacf78875b08aa2132abbb387ec4397a96711a3" + }, + "required_dependencies": [], + "size": 568225, + "date_published": "2025-08-25T13:12:55.910412Z" + } + ] + }, { "pakku_id": "oLp78y55xvS4lBnk", "type": "MOD", diff --git a/pakku.json b/pakku.json index a0a093ca3..5a8bc354e 100644 --- a/pakku.json +++ b/pakku.json @@ -158,9 +158,6 @@ "first-person-model": { "side": "CLIENT" }, - "ftb-backups-2": { - "side": "BOTH" - }, "no-report-button": { "side": "CLIENT" }, @@ -254,6 +251,34 @@ "detected-setblock-be-gone": { "side": "BOTH" }, + "ftb-backups-2": { + "side": "BOTH", + "export": false + }, + "ftb-chunks-forge": { + "export": false + }, + "ftb-essentials": { + "export": false + }, + "ftb-filter-system": { + "export": false + }, + "ftb-library-forge": { + "export": false + }, + "ftb-quests-forge": { + "export": false + }, + "ftb-ranks-forge": { + "export": false + }, + "ftb-teams-forge": { + "export": false + }, + "ftb-xmod-compat": { + "export": false + }, "probejs": { "export": false }