From ae8fd3f1b19dfe36c9650a09a792654c243ffed3 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 01:22:41 +0500 Subject: [PATCH 01/35] workflows --- .github/workflows/build.yml | 4 +--- CHANGELOG.md | 2 +- pakku.json | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a28ce1d7..d83e3bd76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,6 @@ concurrency: cancel-in-progress: true env: - RELEASE_TYPE: "alpha" MINECRAFT_VERSION: "1.20.1" DEV_ENVIRONMENT: ${{ github.ref_name != 'main' }} @@ -156,7 +155,6 @@ jobs: uses: coditory/changelog-parser@v1.0.2 with: path: CHANGELOG.md - version: ${{ steps.determine_version.outputs.version }} continue-on-error: true - name: 🔍 Check @@ -168,7 +166,7 @@ jobs: 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 + echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT echo "minecraft_version=${{ steps.pakku_lock_info.outputs.mc_versions }}" >> $GITHUB_OUTPUT diff --git a/CHANGELOG.md b/CHANGELOG.md index 518655bad..c81dd5a1d 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 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": [ From 6724f4d9ac6f52a218575a40df6658969686a0a3 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 01:32:28 +0500 Subject: [PATCH 02/35] Update build.yml --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d83e3bd76..72d47c3b3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -140,15 +140,14 @@ 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 @@ -163,16 +162,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=${{ steps.pakku_info.outputs.release_type }}" >> $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 + echo "changelog=${{ steps.changelog_dev.outputs.description }}" >> $GITHUB_OUTPUT + else + echo "project_version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT + echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT + echo "changelog=${{ steps.changelog.outputs.description }}" >> $GITHUB_OUTPUT fi - name: 📄 Format diff @@ -199,7 +199,7 @@ jobs: 📃 **Make Release**: `${{ steps.check.outputs.make_release }}` - ${{ steps.changelog.outputs.description }} + ${{ steps.check.outputs.changelog }} ${{ steps.format_diff.outputs.text }} From 8313499f2ae46c6a0008c3b7882310352d0f86d1 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 01:34:09 +0500 Subject: [PATCH 03/35] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72d47c3b3..d1fa6ebd9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -168,11 +168,11 @@ jobs: 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 - echo "changelog=${{ steps.changelog_dev.outputs.description }}" >> $GITHUB_OUTPUT + echo "changelog="${{ steps.changelog_dev.outputs.description }}"" >> $GITHUB_OUTPUT else echo "project_version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT - echo "changelog=${{ steps.changelog.outputs.description }}" >> $GITHUB_OUTPUT + echo "changelog="${{ steps.changelog.outputs.description }}"" >> $GITHUB_OUTPUT fi - name: 📄 Format diff From 123396b10b3c906828830ec6a4b49b78bd4afd75 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 01:36:30 +0500 Subject: [PATCH 04/35] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1fa6ebd9..0e848f692 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -199,8 +199,8 @@ jobs: 📃 **Make Release**: `${{ steps.check.outputs.make_release }}` - ${{ steps.check.outputs.changelog }} - ${{ steps.format_diff.outputs.text }} + "${{ steps.check.outputs.changelog }}" + "${{ steps.format_diff.outputs.text }}" build-modpack: From 0c415824066818c375b6df0a53b7ad92291b00d8 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 01:46:12 +0500 Subject: [PATCH 05/35] Update build.yml --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e848f692..9fb00533d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: project_version: ${{ steps.check.outputs.project_version }} 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 }} + changelog: ${{ steps.check.outputs.changelog }} diff: ${{ steps.read_diff.outputs.diff }} exists: ${{ steps.check.outputs.exists }} make_release: ${{ steps.check.outputs.make_release }} @@ -160,19 +160,19 @@ jobs: id: check shell: bash 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 "minecraft_version=${{ steps.pakku_lock_info.outputs.mc_versions }}" >> $GITHUB_OUTPUT + 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 '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 - echo "changelog="${{ steps.changelog_dev.outputs.description }}"" >> $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 + echo 'changelog=${{ steps.changelog_dev.outputs.description }}' >> $GITHUB_OUTPUT else - echo "project_version=${{ steps.pakku_info.outputs.version }}" >> $GITHUB_OUTPUT - echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT - echo "changelog="${{ steps.changelog.outputs.description }}"" >> $GITHUB_OUTPUT + echo 'project_version=${{ steps.pakku_info.outputs.version }}' >> $GITHUB_OUTPUT + echo 'release_type=${{ steps.pakku_info.outputs.release_type }}' >> $GITHUB_OUTPUT + echo 'changelog=${{ steps.changelog.outputs.description }}' >> $GITHUB_OUTPUT fi - name: 📄 Format diff @@ -199,8 +199,8 @@ jobs: 📃 **Make Release**: `${{ steps.check.outputs.make_release }}` - "${{ steps.check.outputs.changelog }}" - "${{ steps.format_diff.outputs.text }}" + ${{ steps.check.outputs.changelog }} + ${{ steps.format_diff.outputs.text }} build-modpack: From 1231cd4d80286ac516aba525cc8f9babc087cceb Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 01:53:53 +0500 Subject: [PATCH 06/35] Update build.yml --- .github/workflows/build.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fb00533d..1c0521989 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,6 @@ concurrency: cancel-in-progress: true env: - MINECRAFT_VERSION: "1.20.1" DEV_ENVIRONMENT: ${{ github.ref_name != 'main' }} jobs: @@ -23,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.check.outputs.changelog }} + 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 }} @@ -163,14 +164,14 @@ jobs: 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 'minecraft_version=${{ steps.pakku_lock_info.outputs.mc_versions }}' >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo ${{ steps.pakku_lock_info.outputs.mc_versions }} | jq -r '.[]')" >> $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 echo 'changelog=${{ steps.changelog_dev.outputs.description }}' >> $GITHUB_OUTPUT else - echo 'project_version=${{ steps.pakku_info.outputs.version }}' >> $GITHUB_OUTPUT + echo 'project_version=${{ steps.changelog.outputs.version }}' >> $GITHUB_OUTPUT echo 'release_type=${{ steps.pakku_info.outputs.release_type }}' >> $GITHUB_OUTPUT echo 'changelog=${{ steps.changelog.outputs.description }}' >> $GITHUB_OUTPUT fi @@ -417,7 +418,7 @@ 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 }} @@ -468,8 +469,8 @@ 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 @@ -514,10 +515,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 @@ -540,8 +541,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 From aef4de08a5f4e999202eacac14f398e7e094e1f8 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 01:55:24 +0500 Subject: [PATCH 07/35] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c0521989..bb0ef5a11 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,11 +169,11 @@ jobs: 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 - echo 'changelog=${{ steps.changelog_dev.outputs.description }}' >> $GITHUB_OUTPUT + echo "changelog=$(echo ${{ steps.changelog_dev.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT else echo 'project_version=${{ steps.changelog.outputs.version }}' >> $GITHUB_OUTPUT echo 'release_type=${{ steps.pakku_info.outputs.release_type }}' >> $GITHUB_OUTPUT - echo 'changelog=${{ steps.changelog.outputs.description }}' >> $GITHUB_OUTPUT + echo "changelog=$(echo ${{ steps.changelog.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT fi - name: 📄 Format diff From 2a1b0bcad353e2569165dabe84055b74a66a610e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:00:02 +0500 Subject: [PATCH 08/35] Update build.yml --- .github/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb0ef5a11..846ece9f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -166,14 +166,14 @@ jobs: echo 'project_name=${{ steps.pakku_info.outputs.name }}' >> $GITHUB_OUTPUT echo "minecraft_version=$(echo ${{ steps.pakku_lock_info.outputs.mc_versions }} | jq -r '.[]')" >> $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 - echo "changelog=$(echo ${{ steps.changelog_dev.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT + f [[ "${{ env.DEV_ENVIRONMENT }}" == "true" && "${{ steps.changelog.outcome }}" == "failure" ]]; then + echo 'project_version=build_#${{ github.run_number }}' >> $GITHUB_OUTPUT + echo 'release_type=Unreleased' >> $GITHUB_OUTPUT + echo "changelog=$(echo ${{ steps.changelog_dev.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT else - echo 'project_version=${{ steps.changelog.outputs.version }}' >> $GITHUB_OUTPUT - echo 'release_type=${{ steps.pakku_info.outputs.release_type }}' >> $GITHUB_OUTPUT - echo "changelog=$(echo ${{ steps.changelog.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT + echo 'project_version=${{ steps.changelog.outputs.version }}' >> $GITHUB_OUTPUT + echo 'release_type=${{ steps.pakku_info.outputs.release_type }}' >> $GITHUB_OUTPUT + echo "changelog=$(echo ${{ steps.changelog.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT fi - name: 📄 Format diff From 8c53d5dd3c6d4107bb9e8eae07c3a49dd117b3b9 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:02:05 +0500 Subject: [PATCH 09/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 846ece9f7..b269d119a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -166,7 +166,7 @@ jobs: echo 'project_name=${{ steps.pakku_info.outputs.name }}' >> $GITHUB_OUTPUT echo "minecraft_version=$(echo ${{ steps.pakku_lock_info.outputs.mc_versions }} | jq -r '.[]')" >> $GITHUB_OUTPUT - f [[ "${{ env.DEV_ENVIRONMENT }}" == "true" && "${{ steps.changelog.outcome }}" == "failure" ]]; then + 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 echo "changelog=$(echo ${{ steps.changelog_dev.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT From 05d9a47e6d3a59dd994b41e83e53901e226e1041 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:06:34 +0500 Subject: [PATCH 10/35] Update build.yml --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b269d119a..09c14c309 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,19 +161,19 @@ jobs: id: check shell: bash 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 "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 "minecraft_version=$(echo ${{ steps.pakku_lock_info.outputs.mc_versions }} | jq -r '.[]')" >> $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' && steps.changelog.outcome == 'failure' }}; then + echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT + echo "release_type=Unreleased" >> $GITHUB_OUTPUT echo "changelog=$(echo ${{ steps.changelog_dev.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT else - echo 'project_version=${{ steps.changelog.outputs.version }}' >> $GITHUB_OUTPUT - echo 'release_type=${{ steps.pakku_info.outputs.release_type }}' >> $GITHUB_OUTPUT - echo "changelog=$(echo ${{ steps.changelog.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT + echo "project_version=${{ steps.changelog.outputs.version }}" >> $GITHUB_OUTPUT + echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT + echo "changelog=${{ steps.changelog.outputs.description }}" >> $GITHUB_OUTPUT fi - name: 📄 Format diff From 943a3b2c0c2ade1c4f8ed77be7ca6c11916584da Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:07:37 +0500 Subject: [PATCH 11/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09c14c309..b8434edda 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,7 +169,7 @@ jobs: 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 - echo "changelog=$(echo ${{ steps.changelog_dev.outputs.description }} | sed 's/$/\\n/g')" >> $GITHUB_OUTPUT + echo "changelog=${{ steps.changelog_dev.outputs.description }}" >> $GITHUB_OUTPUT else echo "project_version=${{ steps.changelog.outputs.version }}" >> $GITHUB_OUTPUT echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT From 359965673da9ef594a68dd15dd9e7db69f7c0b25 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:09:40 +0500 Subject: [PATCH 12/35] Update build.yml --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8434edda..79226fb17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -169,11 +169,11 @@ jobs: 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 - echo "changelog=${{ steps.changelog_dev.outputs.description }}" >> $GITHUB_OUTPUT + echo "changelog='${{ steps.changelog_dev.outputs.description }}'" >> $GITHUB_OUTPUT else echo "project_version=${{ steps.changelog.outputs.version }}" >> $GITHUB_OUTPUT echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT - echo "changelog=${{ steps.changelog.outputs.description }}" >> $GITHUB_OUTPUT + echo "changelog='${{ steps.changelog.outputs.description }}'" >> $GITHUB_OUTPUT fi - name: 📄 Format diff From 60bf78d76ec8fb3c33971f506b3b722d2d68f281 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:13:14 +0500 Subject: [PATCH 13/35] Update build.yml --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 79226fb17..a488da1d8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: project_version: ${{ steps.check.outputs.project_version }} project_name: ${{ steps.check.outputs.project_name }} project_full_name: ${{ steps.check.outputs.project_name }}-${{ steps.check.outputs.project_version }} - changelog: ${{ steps.check.outputs.changelog }} + 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 }} @@ -169,11 +169,9 @@ jobs: 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 - echo "changelog='${{ steps.changelog_dev.outputs.description }}'" >> $GITHUB_OUTPUT else echo "project_version=${{ steps.changelog.outputs.version }}" >> $GITHUB_OUTPUT echo "release_type=${{ steps.pakku_info.outputs.release_type }}" >> $GITHUB_OUTPUT - echo "changelog='${{ steps.changelog.outputs.description }}'" >> $GITHUB_OUTPUT fi - name: 📄 Format diff @@ -200,7 +198,7 @@ jobs: 📃 **Make Release**: `${{ steps.check.outputs.make_release }}` - ${{ steps.check.outputs.changelog }} + ${{ steps.changelog_dev.outputs.description }} ${{ steps.format_diff.outputs.text }} From 8854195e44cce65e4c752e63ff85c803a89fa970 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:18:28 +0500 Subject: [PATCH 14/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a488da1d8..aecc85d1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: 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 "minecraft_version=$(echo ${{ steps.pakku_lock_info.outputs.mc_versions }} | jq -r '.[]')" >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | tr -d '\n' | xargs)" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From 958b4ee8df2912b21280f995a91fcacba1b62fcc Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:25:30 +0500 Subject: [PATCH 15/35] Update build.yml --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aecc85d1f..753827273 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: 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 "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | tr -d '\n' | xargs)" >> $GITHUB_OUTPUT + echo "minecraft_version=${{ steps.pakku_lock_info.outputs.mc_versions | jq -r '.[]' | tr -d '\n' | xargs}}" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT @@ -216,7 +216,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 @@ -270,7 +270,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 From fc80327273e986a9d0a094bc61a19e8cf68bdf90 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:30:28 +0500 Subject: [PATCH 16/35] Update build.yml --- .github/workflows/build.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 753827273..a9f0c116b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,10 +161,14 @@ jobs: id: check shell: bash 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 "minecraft_version=${{ steps.pakku_lock_info.outputs.mc_versions | jq -r '.[]' | tr -d '\n' | xargs}}" >> $GITHUB_OUTPUT + process_versions() { + local input="$1" + echo "$input" | jq -r '.' | tr -d '\n' | xargs + } + 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 minecraft_version=$(process_versions "${{ 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 From 05dc04d2750f07c3e53f5735c9be7be46f1465b9 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:32:50 +0500 Subject: [PATCH 17/35] Update build.yml --- .github/workflows/build.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9f0c116b..46ae1d68f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,14 +161,10 @@ jobs: id: check shell: bash run: | - process_versions() { - local input="$1" - echo "$input" | jq -r '.' | tr -d '\n' | xargs - } - 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 minecraft_version=$(process_versions "${{ steps.pakku_lock_info.outputs.mc_versions }}") >> $GITHUB_OUTPUT + 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 "minecraft_version="$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | tr -d '\n' | xargs)"" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From 232b0a6eb77a8fd9dc3785359351cde17e80267f Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:37:16 +0500 Subject: [PATCH 18/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46ae1d68f..6e7aaf648 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: 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 "minecraft_version="$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | tr -d '\n' | xargs)"" >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | tr -d '\n' | xargs)" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From e15e4174d4a95fbaa35e3328cfdb57eb4282b50c Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:38:14 +0500 Subject: [PATCH 19/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e7aaf648..50cd600cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: 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 "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | tr -d '\n' | xargs)" >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]')" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From bf2935b178e51a054a23bb155a3fc8c35d648287 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:39:32 +0500 Subject: [PATCH 20/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50cd600cc..d38a376f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: 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 "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]')" >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | cut -d '"' -f2)" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From d096be87987ba7e68cf32d31ba1a98c3be54281a Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:43:16 +0500 Subject: [PATCH 21/35] Update build.yml --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d38a376f0..a7da743a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,9 @@ jobs: 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 "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[]' | cut -d '"' -f2)" >> $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 if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From e18b356f1a9aab35bc4e01a729508591abc217c9 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:46:41 +0500 Subject: [PATCH 22/35] Update build.yml --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7da743a1..6d7152c86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,11 +164,10 @@ jobs: 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 - 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 + MINECRAFT_VERSION=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') + echo "minecraft_version=(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"')" >> $GITHUB_OUTPUT - if ${{ env.DEV_ENVIRONMENT == 'true' && steps.changelog.outcome == 'failure' }}; then + if ${{ env.DEV_ENVIRONMENT == 'true' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT echo "release_type=Unreleased" >> $GITHUB_OUTPUT else From a8770917f0b319321c767959bec429781ee642fe Mon Sep 17 00:00:00 2001 From: Nebby1999 Date: Sat, 19 Jul 2025 17:48:25 -0400 Subject: [PATCH 23/35] Update changelog to include important pink thorium --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c81dd5a1d..471bfcc38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From d60fc1c270b7269d0df297eb5363f99d18c4b104 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:48:33 +0500 Subject: [PATCH 24/35] Update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d7152c86..8bcde6ab6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,8 +164,7 @@ jobs: 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 - MINECRAFT_VERSION=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') - echo "minecraft_version=(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"')" >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"')" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From 564a716f49d4db2b5262afd46ecdb07f9011bda5 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:52:34 +0500 Subject: [PATCH 25/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bcde6ab6..d04f745a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: 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 "minecraft_version=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"')" >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]')" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From 25cb86b0c873771ed3abd676920b349d69a4dd0c Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:55:58 +0500 Subject: [PATCH 26/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d04f745a8..5376113b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,7 @@ jobs: 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 "minecraft_version=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]')" >> $GITHUB_OUTPUT + echo "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"')" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From 6241454da4f9405efa8200888a84c402b0ddf6b9 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 02:57:53 +0500 Subject: [PATCH 27/35] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5376113b5..7463f5ecf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,8 @@ jobs: 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 "minecraft_version=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"')" >> $GITHUB_OUTPUT + MINECRAFT_VERSION=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') + echo "minecraft_version=$MINECRAFT_VERSION" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then echo "project_version=build_#${{ github.run_number }}" >> $GITHUB_OUTPUT From 208a240702239f77d25f3686a7ea3991c6a6fb88 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:00:42 +0500 Subject: [PATCH 28/35] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7463f5ecf..e088bb1ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,7 +164,8 @@ jobs: 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 - MINECRAFT_VERSION=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') + MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}' + MINECRAFT_VERSION=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') echo "minecraft_version=$MINECRAFT_VERSION" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then From 7b52de45c18b0ab9ede0450f5360727bac606bc8 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:02:48 +0500 Subject: [PATCH 29/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e088bb1ba..ae73f8280 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,7 +165,7 @@ jobs: echo "exists=${{ steps.check_tag.outputs.exists }}" >> $GITHUB_OUTPUT echo "project_name=${{ steps.pakku_info.outputs.name }}" >> $GITHUB_OUTPUT MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}' - MINECRAFT_VERSION=$(echo "${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') + MINECRAFT_VERSION=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') echo "minecraft_version=$MINECRAFT_VERSION" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then From 57ee1c331e2972f77ab8cb218a6056326ff33fe5 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:04:42 +0500 Subject: [PATCH 30/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae73f8280..38782c362 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,7 +165,7 @@ jobs: echo "exists=${{ steps.check_tag.outputs.exists }}" >> $GITHUB_OUTPUT echo "project_name=${{ steps.pakku_info.outputs.name }}" >> $GITHUB_OUTPUT MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}' - MINECRAFT_VERSION=$(echo "$${{ steps.pakku_lock_info.outputs.mc_versions }}" | jq -r '.[0]' | tr -d '[]"') + MINECRAFT_VERSION=$(echo "$MC_VERSIONS_JSON" | jq -r '.[0]' | tr -d '[]"') echo "minecraft_version=$MINECRAFT_VERSION" >> $GITHUB_OUTPUT if ${{ env.DEV_ENVIRONMENT == 'true' }}; then From e5d4e76ad13b231a831b44e56dc03b4cd991c3f0 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:18:27 +0500 Subject: [PATCH 31/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38782c362..6d114306d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -161,7 +161,7 @@ jobs: id: check shell: bash run: | - echo "make_release=${{ steps.check_tag.outputs.exists == false && env.DEV_ENVIRONMENT == false }}" >> $GITHUB_OUTPUT + 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 MC_VERSIONS_JSON='${{ steps.pakku_lock_info.outputs.mc_versions }}' From fb0c7efb0f27aa0bd81b07fd249a695fd79dbc66 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:33:42 +0500 Subject: [PATCH 32/35] Update build.yml --- .github/workflows/build.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d114306d..8120749a5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -246,17 +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: 📁 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 + - 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 From 8181680c0765ad6073e5b771abb403600525fa51 Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 03:37:00 +0500 Subject: [PATCH 33/35] Update build.yml --- .github/workflows/build.yml | 37 +++---------------------------------- 1 file changed, 3 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8120749a5..af6fb0cc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -258,37 +258,6 @@ jobs: 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 - run: | - set +e - - VERSION=${{ needs.info.outputs.project_version }} - 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 - uses: actions/cache@v4.2.3 - id: cache - 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: 📁 Rename artifact server run: | cd ./build/serverpack/ @@ -354,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: @@ -424,7 +393,7 @@ jobs: 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: @@ -474,7 +443,7 @@ jobs: 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: From 99c89fcda050775cbb96e4d4fd26ae4448786fef Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 04:13:05 +0500 Subject: [PATCH 34/35] Update pakku-lock.json --- pakku-lock.json | 50 ++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) 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" } ] }, From c0150abe04d382b7f7358cd35190316a76e4615e Mon Sep 17 00:00:00 2001 From: Xikaro Date: Sun, 20 Jul 2025 04:18:29 +0500 Subject: [PATCH 35/35] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af6fb0cc5..d8c3fb1fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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