diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a28ce1d7..d8c3fb1fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,8 +11,6 @@ concurrency: cancel-in-progress: true env: - RELEASE_TYPE: "alpha" - MINECRAFT_VERSION: "1.20.1" DEV_ENVIRONMENT: ${{ github.ref_name != 'main' }} jobs: @@ -24,6 +22,8 @@ jobs: project_name: ${{ steps.check.outputs.project_name }} project_full_name: ${{ steps.check.outputs.project_name }}-${{ steps.check.outputs.project_version }} changelog: ${{ steps.changelog.outputs.description }} + mc_version: ${{ steps.check.outputs.minecraft_version }} + release_type: ${{ steps.check.outputs.release_type }} diff: ${{ steps.read_diff.outputs.diff }} exists: ${{ steps.check.outputs.exists }} make_release: ${{ steps.check.outputs.make_release }} @@ -58,7 +58,7 @@ jobs: id: latest_tag shell: bash run: | - tag=$(git describe --tags --abbrev=0) + tag=$(git describe --tags --abbrev=0 origin/main) if [ -z "$tag" ]; then echo "❌ Latest tag not found" && exit 1 else @@ -141,22 +141,20 @@ jobs: with: tag: ${{ steps.pakku_info.outputs.version }} - - name: 📝 Determine Version - id: determine_version - shell: bash - run: | - if ${{ env.DEV_ENVIRONMENT == 'true' }}; then - echo "version=unreleased" >> $GITHUB_OUTPUT - else - echo "version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT - fi + - name: 📄 Changelog Dev Parser + id: changelog_dev + if: ${{ env.DEV_ENVIRONMENT == 'true' }} + uses: coditory/changelog-parser@v1.0.2 + with: + path: CHANGELOG.md + version: "unreleased" + continue-on-error: true - name: 📄 Changelog Parser id: changelog uses: coditory/changelog-parser@v1.0.2 with: path: CHANGELOG.md - version: ${{ steps.determine_version.outputs.version }} continue-on-error: true - name: 🔍 Check @@ -165,16 +163,17 @@ jobs: run: | echo "make_release=${{ steps.check_tag.outputs.exists == 'false' && env.DEV_ENVIRONMENT == 'false' }}" >> $GITHUB_OUTPUT echo "exists=${{ steps.check_tag.outputs.exists }}" >> $GITHUB_OUTPUT - echo "project_name=${{ steps.pakku_info.outputs.name }}" >> $GITHUB_OUTPUT - echo "project_version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT - echo "release_type=${{ env.RELEASE_TYPE }}" >> $GITHUB_OUTPUT + MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}' + MINECRAFT_VERSION=$(echo "$MC_VERSIONS_JSON" | jq -r '.[0]' | tr -d '[]"') + echo "minecraft_version=$MINECRAFT_VERSION" >> $GITHUB_OUTPUT - echo "minecraft_version=${{ steps.pakku_lock_info.outputs.mc_versions }}" >> $GITHUB_OUTPUT - - if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then - echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT - echo "release_type=Unreleased" >> $GITHUB_OUTPUT + if ${{ env.DEV_ENVIRONMENT == 'true' }}; then + echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT + echo "release_type=Unreleased" >> $GITHUB_OUTPUT + else + echo "project_version=${{ steps.changelog.outputs.version }}" >> $GITHUB_OUTPUT + echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT fi - name: 📄 Format diff @@ -201,7 +200,7 @@ jobs: 📃 **Make Release**: `${{ steps.check.outputs.make_release }}` - ${{ steps.changelog.outputs.description }} + ${{ steps.changelog_dev.outputs.description }} ${{ steps.format_diff.outputs.text }} @@ -219,7 +218,7 @@ jobs: set +e VERSION=${{ needs.info.outputs.project_version }} - sed -i -e "s/\"version\": \"[0-9.]*\"/\"version\": \"${VERSION}\"/g" pakku.json + sed -i -e "s/DEV/${VERSION}/g" pakku.json sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt - name: 📝 Cache pakku @@ -247,48 +246,17 @@ jobs: path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip if-no-files-found: error - # - name: 📁 Rename artifact modrinth - # run: | - # cd ./build/modrinth/ - # mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack - - # - name: 🚀 Upload artifact modrinth - # uses: actions/upload-artifact@v4.6.2 - # with: - # name: ${{ needs.info.outputs.project_full_name }}-modrinth - # path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack - # if-no-files-found: warn - - build-server: - name: 📦 Build Server - needs: [info] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.2.2 - - - name: 🔄 Replace strings - shell: bash + - name: 📁 Rename artifact modrinth run: | - set +e + cd ./build/modrinth/ + mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack - VERSION=${{ needs.info.outputs.project_version }} - sed -i -e "s/\"version\": \"[0-9.]*\"/\"version\": \"${VERSION}\"/g" pakku.json - sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt - - - name: 📝 Cache pakku - uses: actions/cache@v4.2.3 - id: cache + - name: 🚀 Upload artifact modrinth + uses: actions/upload-artifact@v4.6.2 with: - path: build/.cache - key: pakku-cache-${{ hashFiles('pakku-lock.json') }} - restore-keys: pakku-cache- - - - name: 📦 Export modpack - run: | - mv -vf ./.pakku/server-overrides/* ./ - curl https://github.com/juraj-hrivnak/pakku/releases/latest/download/pakku.jar -o pakku.jar -L -J - java -jar pakku.jar export + name: ${{ needs.info.outputs.project_full_name }}-modrinth + path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack + if-no-files-found: warn - name: 📁 Rename artifact server run: | @@ -355,7 +323,7 @@ jobs: release-github: name: 🚀 Release to GitHub - needs: [info, build-modpack, build-server, build-multimc] + needs: [info, build-modpack, build-multimc] runs-on: ubuntu-latest if: ${{ needs.info.outputs.make_release == 'true' }} outputs: @@ -419,13 +387,13 @@ jobs: ${{ needs.info.outputs.project_full_name }}-curseforge.zip ${{ needs.info.outputs.project_full_name }}-serverpack.zip ${{ needs.info.outputs.project_full_name }}-multimc.zip - prerelease: ${{ env.RELEASE_TYPE != 'release' }} + prerelease: ${{ needs.info.outputs.release_type != 'release' }} generate_release_notes: true token: ${{ secrets.GITHUB_TOKEN }} release-curseforge: name: 🚀 Release to CurseForge - needs: [info, build-modpack, build-server, release-github] + needs: [info, build-modpack, release-github] runs-on: ubuntu-latest if: ${{ needs.info.outputs.make_release == 'true' }} outputs: @@ -470,12 +438,12 @@ jobs: ${{ needs.info.outputs.changelog }} ${{ needs.info.outputs.diff }} changelog-format: markdown - game-version: ${{ env.MINECRAFT_VERSION }} - release-type: ${{ env.RELEASE_TYPE }} + game-version: ${{ needs.info.outputs.mc_version }} + release-type: ${{ needs.info.outputs.release_type }} release-modrinth: name: 🚀 Release to Modrinth - needs: [info, build-modpack, build-server, release-github] + needs: [info, build-modpack, release-github] runs-on: ubuntu-latest if: false outputs: @@ -516,10 +484,10 @@ jobs: modpack-server-path: ${{ needs.info.outputs.project_full_name }}-serverpack.zip changelog: ${{ needs.info.outputs.changelog }} changelog-format: markdown - game-version: ${{ env.MINECRAFT_VERSION }} + 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: ${{ env.RELEASE_TYPE }} + release-type: ${{ needs.info.outputs.release_type }} discord-message: name: 📱 Discord Message @@ -542,8 +510,8 @@ jobs: content_links_no_embed: .+ content: | **Release**: `${{ needs.info.outputs.project_version }}` - **Release Type**: `${{ env.RELEASE_TYPE }}` - **Game Version**: `${{ env.MINECRAFT_VERSION }}` + **Release Type**: `${{ needs.info.outputs.release_type }}` + **Game Version**: `${{ needs.info.outputs.mc_version }}` [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern/files/${{ needs.release-curseforge.outputs.id }}) • [GitHub](${{ needs.release-github.outputs.url }}) • [Issues](https://github.com/${{ github.repository }}/issues) ```markdown diff --git a/CHANGELOG.md b/CHANGELOG.md index 518655bad..471bfcc38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [Unreleased] ### Changes -## [0.10.1] - 19.07.2025 +## [0.10.1] - 19-07-2025 ### Changes - Added harvest baskets to pick fruit from fruit trees and berry bushes (#1338) @Redeix - Added ice soup @Pyritie @@ -14,6 +14,7 @@ - Allowed "window" blocks and panes to be broken and picked up @BlueBoat29 - Updated title and loading screens to be more memory efficient and hopefully look better on other resolutions. (#1381) @Redeix - Changed Firmalife greenhouses to no longer allow any doors/trapdoors/pipes (#1363) @BlueBoat29 +- Thorium is now Pink (#1378) @Nebby1999 ### Bug fixes - Fixed yeast food processor conflict (#1310) @Redeix - Fixed seed oil voiding in barrels (#1310) @Redeix diff --git a/pakku-lock.json b/pakku-lock.json index 31b9f652f..579372bdf 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -4167,7 +4167,7 @@ ] }, { - "pakku_id": "NnX7LmflX7AOHEeC", + "pakku_id": "WR8Eaw7xnPnm4UOD", "pakku_links": [ "Nw8xTCQngHA15ilh" ], @@ -4186,6 +4186,30 @@ "modrinth": "ATDdrG1y" }, "files": [ + { + "type": "curseforge", + "file_name": "create_hypertube-0.2.3-FORGE.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "neoforge", + "forge" + ], + "release_type": "beta", + "url": "https://edge.forgecdn.net/files/6785/769/create_hypertube-0.2.3-FORGE.jar", + "id": "6785769", + "parent_id": "1281336", + "hashes": { + "sha1": "15fecf45a7da064af350847c259903af18b6007b", + "md5": "054b2859b02a495ecea2ab5fc6ff6fc1" + }, + "required_dependencies": [ + "328085" + ], + "size": 310156, + "date_published": "2025-07-19T00:55:36.140Z" + }, { "type": "modrinth", "file_name": "create_hypertube-0.2.3-FORGE.jar", @@ -4214,30 +4238,6 @@ ], "size": 310156, "date_published": "2025-07-19T00:59:05.441048Z" - }, - { - "type": "curseforge", - "file_name": "create_hypertube-0.2.2-FORGE.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6721/285/create_hypertube-0.2.2-FORGE.jar", - "id": "6721285", - "parent_id": "1281336", - "hashes": { - "sha1": "d162b8a797883b100d1e04f19ce8c0c12e0c1f11", - "md5": "e1776892a5897e2cb5361dfcc76049e6" - }, - "required_dependencies": [ - "328085" - ], - "size": 299727, - "date_published": "2025-07-02T14:17:53.393Z" } ] }, diff --git a/pakku.json b/pakku.json index efe374591..85f1db03a 100644 --- a/pakku.json +++ b/pakku.json @@ -1,6 +1,7 @@ { "name": "TerraFirmaGreg-Modern", - "version": "0.10.0", + "version": "DEV", + "release_type": "alpha", "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.", "author": "Exception, Xikaro", "overrides": [