From b38c9999489125f9e5b32429363afbcc8067e05a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 00:32:59 +0500 Subject: [PATCH 01/63] rework workflows --- .github/workflows/build.yml | 317 ++++++++++++++++++++++++++++++++++ .github/workflows/preview.yml | 68 -------- .github/workflows/release.yml | 219 ++++++++++++++--------- CHANGELOG.md | 5 +- 4 files changed, 453 insertions(+), 156 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/preview.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..3c7d8e779 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,317 @@ +name: Build +run-name: "Build #${{ github.run_number }}" + +on: + push: + tags: + - "*.*.*" + branches: + - main + +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + modpack-info: + name: Modpack Info + runs-on: ubuntu-latest + outputs: + project_name: ${{ steps.info.outputs.project_name }} + project_version: ${{ steps.info.outputs.project_version }} + mcversion: ${{ steps.info.outputs.mcversion }} + tag: ${{ steps.version.outputs.tag }} + changelog: ${{ steps.changelog_full.outputs.description }} + steps: + - name: Checkout with fetch depth 2 + uses: actions/checkout@v4.1.1 + with: + fetch-depth: 2 + + - name: Get tag + id: version + uses: "WyriHaximus/github-action-get-previous-tag@v1.3.0" + with: + fallback: tag_not_found + + - name: Modpack info + id: info + run: | + set +e + + if [ ! -f ./.github/buildtools/modpack/manifest.json ]; then + echo "::error::Could not find manifest.json" && exit 1 + fi + manifestjson=`cat ./.github/buildtools/modpack/manifest.json` + + project_name=`echo $(jq -r '.name' <<< "$manifestjson")` + echo "project_name=$project_name" >> $GITHUB_OUTPUT + + mcversion=`echo $(jq -r '.minecraft.version' <<< "$manifestjson")` + echo "mcversion=$mcversion" >> $GITHUB_OUTPUT + + if [[ ${{ startsWith(github.ref, 'refs/tags/') }} == true ]]; then + echo "project_version=${{ steps.version.outputs.tag }}" >> $GITHUB_OUTPUT + else + echo "project_version=build.${{ github.run_number }}" >> $GITHUB_OUTPUT + fi + + - name: Checkout with fetch depth 0 + uses: actions/checkout@v4.1.1 + with: + fetch-depth: 0 + - name: Process changelog + id: mod_changes + shell: bash + run: | + set +e + + curl https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux -o ./pax/jd -L -J + sudo chmod +x ./pax/jd + + manifest="./.github/buildtools/modpackmanifest.json" + changelog="./CHANGELOG.md" + + branch=$(git rev-parse --abbrev-ref HEAD) + current_commit=$(git rev-parse --short ${{ github.sha }}) + previous_commit=$(git log -n 1 --skip 1 --pretty=format:"%h" -- $manifest) + latest_commit=$(git log -n 1 --pretty=format:"%h" $branch -- $manifest) + latest_tag=$(git describe --tags --abbrev=0) + latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) + + if [ "$latest_tag" = ${{ steps.version.outputs.tag }} ]; then + latest_tag=$(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^) + latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) + fi + + if [ "$latest_commit" = "$current_commit" ]; then + echo "changed=true" >> $GITHUB_OUTPUT + else + echo "changed=false" >> $GITHUB_OUTPUT + fi + + echo "branch: $branch" + echo "current commit: $current_commit" + echo "previous commit: $previous_commit" + echo "latest commit: $latest_commit" + echo "latest tagged commit: $latest_tagged_commit" + echo "latest tag: $latest_tag" + + RED='\033[0;31m' + GREEN='\033[0;32m' + BLUE='\033[0;36m' + NC='\033[0m' + + git show $latest_tagged_commit:$manifest > ./.github/buildtools/modpackmanifest_prev.json + mods_removed_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^-' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') + mods_added_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^+' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') + + mods_added="" + mods_removed="" + mods_updated="" + + mod_changes="" + + if [[ ! -z ""$mods_added_raw"" ]]; then + while IFS= read -r line1; do + foo="" + while IFS= read -r line2; do + foo="${line1//$line2}" + if [[ -z ""$foo"" ]]; then + if [[ ! -z ""$mods_updated"" ]]; then + mods_updated+="\n" + fi + mods_updated+="- $line1" + break + fi + done <<< "$mods_removed_raw" + if [[ ! -z ""$foo"" ]]; then + if [[ ! -z ""$mods_added"" ]]; then + mods_added+="\n" + fi + mods_added+="- $foo" + fi + done <<< "$mods_added_raw" + fi + + if [[ ! -z ""$mods_removed_raw"" ]]; then + while IFS= read -r line1; do + bar="" + while IFS= read -r line2; do + bar="${line1//$line2}" + if [[ -z ""$bar"" ]]; then + break + fi + done <<< "$mods_added_raw" + if [[ ! -z ""$bar"" ]]; then + if [[ ! -z ""$mods_removed"" ]]; then + mods_removed+="\n" + fi + mods_removed+="- $bar" + fi + done <<< "$mods_removed_raw" + fi + + if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then + echo -e "x---------------x" + echo -e "| Mod Changes |" + + mod_changes+="## Mod Changes\n\n" + mod_changes+="Since: [\`$latest_tag\`]()\n\n" + mod_changes+="\`\`\`markdown\n" + fi + + if [[ ! -z ""$mods_added"" ]]; then + echo -e "${GREEN}Added:" + echo -e "$mods_added" + + mod_changes+="Added:\n" + mod_changes+="$mods_added\n" + + if [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then + mod_changes+="\n" + fi + fi + if [[ ! -z ""$mods_removed"" ]]; then + echo -e "${RED}Removed:" + echo -e "$mods_removed" + + mod_changes+="Removed:\n" + mod_changes+="$mods_removed\n" + + if [[ ! -z ""$mods_updated"" ]]; then + mod_changes+="\n" + fi + fi + if [[ ! -z ""$mods_updated"" ]]; then + echo -e "${BLUE}Updated:" + echo -e "$mods_updated" + + mod_changes+="Updated:\n" + mod_changes+="$mods_updated\n" + fi + + if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then + echo -e "${NC}x---------------x" + + mod_changes+="\`\`\`" + fi + + if [[ ! -z ""$mod_changes"" ]]; then + echo -e "$mod_changes" >> $GITHUB_STEP_SUMMARY + fi + + # Upload @mod_changes@ + mod_changes=$(echo $mod_changes | sed -r 's/[/]/\\\//g') + perl -i -pe "s/\@mod_changes\@/$mod_changes/g" $changelog + + # Replace @mod_changes@ + mod_changes=$(echo $mod_changes | sed -r 's/\\\\n/\\n/g') + echo "markdown=$mod_changes" >> $GITHUB_OUTPUT + + rm ./.github/buildtools/modpack/manifest_prev.json + + # Replace @version@ + perl -i -pe "s/\@version\@/${{ steps.info.outputs.projectsuffix }}/g" $changelog + + # Finally, Rename changelog + mv $changelog CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md + - name: Upload changelog + uses: actions/upload-artifact@v4.0.0 + with: + name: changelog + path: CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md + + - name: Changelog Parser + id: changelog_full + uses: coditory/changelog-parser@v1.0.2 + with: + path: CHANGELOG.md + + build-modpack: + name: Build Modpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/manifest.json + 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 + + - name: Export CF + run: | + mkdir -p overrides + cp -r {config,defaultconfigs,kubejs} overrides/ + mv -vf .github/buildtools/modpack/manifest.json ./ + mv -vf .github/buildtools/modpack/modlist.html ./ + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides + + - name: Export MMC + run: | + cp -r mods overrides/ + mv -vf overrides/ .minecraft/ + mv -vf .github/buildtools/modpack/mmc-pack.json ./ + mv -vf .github/buildtools/modpack/instance.cfg ./ + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ + + - name: Upload zip cf + uses: actions/upload-artifact@v4.0.0 + with: + name: modpack_cf + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip + + - name: Upload zip mmc + uses: actions/upload-artifact@v4.0.0 + with: + name: modpack_mmc + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip + + build-serverpack: + name: Build Serverpack + runs-on: ubuntu-latest + needs: [modpack-info] + if: startsWith(github.ref, 'refs/tags/v') + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Download Mods + run: | + git submodule init + cd mods + git config --local ${{ secrets.GITHUB_TOKEN }} + git submodule update --recursive + + - name: Export serverpack + run: | + cp -r .github/buildtools/serverpack/* .minecraft/ + cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done + cd .minecraft/ + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./ + + - name: Upload zip + uses: actions/upload-artifact@v4.0.0 + with: + name: server_pack + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip + + release: + name: Release + needs: [modpack-info, build-modpack, build-serverpack] + if: startsWith(github.ref, 'refs/tags/') + uses: ./.github/workflows/release.yml + with: + project_name: ${{ needs.modpack-info.outputs.project_name }} + project_version: ${{ needs.modpack-info.outputs.project_version }} + mcversion: ${{ needs.modpack-info.outputs.mcversion }} + tag: ${{ needs.modpack-info.outputs.tag }} + changelog: ${{ needs.modpack-info.outputs.changelog }} + secrets: inherit + diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml deleted file mode 100644 index 2d080c173..000000000 --- a/.github/workflows/preview.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Deploy modpack preview - -on: - push: - tags: - - "Pre*" - -jobs: - Deploy: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - - name: Get the version - id: get_version - run: echo ::set-output name=version::${GITHUB_REF#refs/tags/Pre} - - - name: Set the version - run: | - DEV=${{ steps.get_version.outputs.version }} - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/manifest.json - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/instance.cfg - sed -i -e "s/DEV/${DEV}/g" config/fancymenu/customization/main_menu.txt - sed -i -e "s/DEV/${DEV}/g" config/bcc-common.toml - - - name: Changelog Parser - id: changelog - uses: coditory/changelog-parser@v1.0.2 - with: - path: CHANGELOG.md - - - name: Submodule init - run: | - git submodule init - cd mods - git config --global credential.helper '!f() { echo "username=Xikaro"; echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' - git submodule update --recursive - - - name: Archive CF - run: | - cp -r {config,defaultconfigs,kubejs,mods} overrides/ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip .github/buildtools/modpack/manifest.json .github/buildtools/modpack/modlist.html overrides - - - name: Archive MMC - run: | - mv -vf overrides/ .minecraft/ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip .github/buildtools/modpack/mmc-pack.json .github/buildtools/modpack/instance.cfg .minecraft/ - - - name: Archive Server - run: | - cp -r .github/buildtools/serverpack/* .minecraft/ - cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - cd .minecraft/ - zip -r ../TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip ./ - - - name: Create GitHub Release - uses: softprops/action-gh-release@v0.1.15 - if: startsWith(github.ref, 'refs/tags/') - with: - prerelease: true - generate_release_notes: true - name: ${{ steps.changelog.outputs.version }} - body: ${{ steps.changelog.outputs.description }} - files: | - ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-cf.zip - ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-mmc.zip - ./TerraFirmaGreg-1.20-${{ steps.get_version.outputs.version }}-server.zip diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69da08c50..7e382865c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,116 +2,165 @@ name: Release run-name: "Release #${{ github.run_number }}" on: - push: - tags: - - "*.*.*" + workflow_call: + inputs: + project_name: + required: true + type: string + project_version: + required: true + type: string + mcversion: + required: true + type: string + tag: + required: true + type: string + changelog: + required: true + type: string + +env: + CF_PROJECT_ID: "399664" + MODRINTH_PROJECT_ID: "75JuuMzk" + RELEASE_TYPE: "beta" jobs: - Deploy: + release-github: + name: Deploy to GitHub runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - - name: Get the version - id: get_version - run: echo ::set-output name=version::${GITHUB_REF#refs/tags/} - - - name: Get tag - id: get_tag - uses: "WyriHaximus/github-action-get-previous-tag@v1.3.0" + - name: Download modpack + uses: actions/download-artifact@v4.1.0 with: - fallback: tag_not_found + pattern: ${{ inputs.project_name }}-${{ inputs.project_version }}-* + merge-multiple: true - - name: Set the version - run: | - DEV=${{ steps.get_version.outputs.version }} - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/manifest.json - sed -i -e "s/DEV/${DEV}/g" .github/buildtools/modpack/instance.cfg - sed -i -e "s/DEV/${DEV}/g" config/fancymenu/customization/main_menu.txt - sed -i -e "s/DEV/${DEV}/g" config/bcc-common.toml - - - name: Changelog Parser - id: changelog - uses: coditory/changelog-parser@v1.0.2 + - name: Download changelog + uses: actions/download-artifact@v4.1.0 with: - path: CHANGELOG.md + name: changelog - - name: Submodule init - run: | - git submodule init - cd mods - git config --local ${{ secrets.GITHUB_TOKEN }} - git submodule update --recursive + - name: Create release + uses: softprops/action-gh-release@v1 + with: + prerelease: false + generate_release_notes: true + name: ${{ inputs.project_version }} + body: ${{ inputs.changelog }} + files: | + ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + tag_name: ${{ inputs.tag }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Archive CF + release-curseforge: + name: Deploy to CurseForge + runs-on: ubuntu-latest + steps: + - name: Check if CF_API_TOKEN exist + shell: bash run: | - mkdir -p overrides - cp -r {config,defaultconfigs,kubejs} overrides/ - mv -vf .github/buildtools/modpack/manifest.json ./ - mv -vf .github/buildtools/modpack/modlist.html ./ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip manifest.json modlist.html overrides + if [ "${{ secrets.CF_API_TOKEN }}" == '' ]; then + echo '::error::No value found for secret key `CF_API_TOKEN`. See https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 + fi - - name: Archive MMC - run: | - cp -r mods overrides/ - mv -vf overrides/ .minecraft/ - mv -vf .github/buildtools/modpack/mmc-pack.json ./ - mv -vf .github/buildtools/modpack/instance.cfg ./ - zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ + - name: Download modpack + uses: actions/download-artifact@v4.1.0 + with: + name: modpack_cf - - name: Archive Server - run: | - cp -r .github/buildtools/serverpack/* .minecraft/ - cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - cd .minecraft/ - zip -r ../TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip ./ + - name: Download serverpack + uses: actions/download-artifact@v4.1.0 + with: + name: server_pack - name: Upload Curseforge id: cf_release uses: SwitchAlpha/upload-curseforge-modpack-action@master with: api-token: ${{ secrets.CF_API_TOKEN }} - project-id: "385053" - modpack-path: ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip - modpack-server-path: ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip - changelog: "${{ steps.changelog.outputs.description }}" + project-id: ${{ env.CF_PROJECT_ID }} + modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + changelog: "${{ inputs.changelog }}" changelog-format: markdown - game-version: "1.20.1" - display-name: TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }} - server-display-name: TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server - release-type: "beta" + game-version: ${{ inputs.mcversion }} + display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + release-type: ${{ env.RELEASE_TYPE }} - - name: Create GitHub Release - uses: softprops/action-gh-release@v0.1.15 - if: startsWith(github.ref, 'refs/tags/') + - name: Create Discord message + id: message + shell: bash + run: | + message="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada:\n" + message+="[CurseForge]() • " + message+="[GitHub]() • " + message+="[Issues](<${{ github.repository.svn_url }}/issues>)\n" + message+="${{ inputs.changelog }}" + echo "markdown=$message" >> $GITHUB_OUTPUT + + - name: Send Discord message + uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 with: - prerelease: false - generate_release_notes: true - name: ${{ steps.changelog.outputs.version }} - body: ${{ steps.changelog.outputs.description }} - files: | - ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip - ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-mmc.zip - ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip + key: "${{secrets.RELEASES_1_20}}" + username: "TerraFirmaGreg" + avatar_url: "https://github.com/TerraFirmaGreg-Team/.github/tree/main/branding/logo_new_year.png?raw=true" + content: "${{ steps.message.outputs.markdown }}" - - name: Discord notification - uses: tsickert/discord-webhook@v5.4.0 - with: - webhook-url: ${{ secrets.RELEASES_1_20 }} - username: "GitHub" - avatar-url: https://github.com/TerraFirmaGreg-Team/.github/tree/main/branding/logo_new_year.png?raw=true - content: "[CurseForge]()" - embed-title: Release ${{ steps.changelog.outputs.version }} - embed-description: "${{ steps.changelog.outputs.description }}" - embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/tree/main/CHANGELOG.md - embed-color: 5814783 - embed-footer-text: ${{ steps.changelog.outputs.date }} + # release-modrinth: + # name: Deploy to Modrinth + # runs-on: ubuntu-latest + # steps: + # - name: Check if MODRINTH_API_TOKEN exist + # shell: bash + # run: | + # if [ "${{ secrets.MODRINTH_API_TOKEN }}" == '' ]; then + # echo '::error::No value found for secret key `MODRINTH_API_TOKEN`. See https://docs.github.com/en/actionssecurity-guides/ encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 + # fi - - name: Close Fixed in dev + # - name: Download modpack + # uses: actions/download-artifact@v4.1.0 + # with: + # name: modpack_mrd + + # - name: Download serverpack + # uses: actions/download-artifact@v4.1.0 + # with: + # name: server_pack + + # - name: Upload Modrinth + # id: cf_release + # uses: SwitchAlpha/upload-curseforge-modpack-action@master + # with: + # api-token: ${{ secrets.MODRINTH_API_TOKEN }} + # project-id: ${{ env.MODRINTH_PROJECT_ID }} + # modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-mrd.zip + # modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + # changelog: "${{ inputs.changelog }}" + # changelog-format: markdown + # game-version: ${{ inputs.mcversion }} + # display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + # server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + # release-type: ${{ env.RELEASE_TYPE }} + + close-fixed-issues: + name: Close Fixed Issues + runs-on: ubuntu-latest + needs: [release-github, release-curseforge] + 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: ${{ steps.get_tag.outputs.tag }} + VERSION: ${{ inputs.tag }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + diff --git a/CHANGELOG.md b/CHANGELOG.md index b8214fba9..f00fdeaf1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [0.4.0] - 03.01.2024 +## [0.4.0] - 05.01.2024 ### Изменения - Удалены из игры бронзовые паровые машины, тк позволяли скипнуть очень много прогресии TFC. - Добавлено очень много квестов для Примитивной эры (пока что без описаний). @@ -27,8 +27,7 @@ - Полублоки, ступени, стены и другие блоки теперь могут осыпаться. - Добавлены бедные и богатые куски руд с их переработкой. - И еще множество всего, чего я забыл. -### Удаленные моды -- TFShips +@mod_changes@ ## [0.3.0] - 26.12.2023 ### Изменения From d470c152bebffe8298600998e3a513f834f1f575 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 00:34:54 +0500 Subject: [PATCH 02/63] Update build.yml --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c7d8e779..cf42d3ced 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -222,11 +222,11 @@ jobs: name: changelog path: CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md - - name: Changelog Parser - id: changelog_full - uses: coditory/changelog-parser@v1.0.2 - with: - path: CHANGELOG.md + # - name: Changelog Parser + # id: changelog_full + # uses: coditory/changelog-parser@v1.0.2 + # with: + # path: CHANGELOG.md build-modpack: name: Build Modpack From e334be8ad82ab20dbe196396205e2a0977130e3b Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 00:45:18 +0500 Subject: [PATCH 03/63] Update build.yml --- .github/workflows/build.yml | 51 +++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf42d3ced..abc3678f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: project_version: ${{ steps.info.outputs.project_version }} mcversion: ${{ steps.info.outputs.mcversion }} tag: ${{ steps.version.outputs.tag }} - changelog: ${{ steps.changelog_full.outputs.description }} + changelog: ${{ steps.mod_changes.outputs.news }} steps: - name: Checkout with fetch depth 2 uses: actions/checkout@v4.1.1 @@ -228,8 +228,8 @@ jobs: # with: # path: CHANGELOG.md - build-modpack: - name: Build Modpack + build-cf-modpack: + name: Build CF Modpack runs-on: ubuntu-latest needs: [modpack-info] steps: @@ -253,6 +253,36 @@ jobs: mv -vf .github/buildtools/modpack/modlist.html ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides + - name: Upload zip cf + uses: actions/upload-artifact@v4.0.0 + with: + name: modpack_cf + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip + + build-mmc-modpack: + name: Build MMC Modpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/manifest.json + 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 + + - name: Download Mods + run: | + git submodule init + cd mods + git config --local ${{ secrets.GITHUB_TOKEN }} + git submodule update --recursive + - name: Export MMC run: | cp -r mods overrides/ @@ -260,12 +290,6 @@ jobs: mv -vf .github/buildtools/modpack/mmc-pack.json ./ mv -vf .github/buildtools/modpack/instance.cfg ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - - - name: Upload zip cf - uses: actions/upload-artifact@v4.0.0 - with: - name: modpack_cf - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip - name: Upload zip mmc uses: actions/upload-artifact@v4.0.0 @@ -277,11 +301,16 @@ jobs: name: Build Serverpack runs-on: ubuntu-latest needs: [modpack-info] - if: startsWith(github.ref, 'refs/tags/v') steps: - name: Checkout uses: actions/checkout@v4.1.1 + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + - name: Download Mods run: | git submodule init @@ -304,7 +333,7 @@ jobs: release: name: Release - needs: [modpack-info, build-modpack, build-serverpack] + needs: [modpack-info, build-cf-modpack, build-serverpack] if: startsWith(github.ref, 'refs/tags/') uses: ./.github/workflows/release.yml with: From 47db7fa6819ce9e09e32061b6b2d776a04dc9e67 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 00:54:00 +0500 Subject: [PATCH 04/63] Update build.yml --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abc3678f9..64eb85811 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -241,7 +241,6 @@ jobs: run: | VERSION=${{ needs.modpack-info.outputs.project_version }} sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/manifest.json - 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 @@ -271,7 +270,6 @@ jobs: shell: bash run: | VERSION=${{ needs.modpack-info.outputs.project_version }} - sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/manifest.json 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 @@ -315,7 +313,9 @@ jobs: run: | git submodule init cd mods - git config --local ${{ secrets.GITHUB_TOKEN }} + git config --local + echo "username=Xikaro"; + echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; git submodule update --recursive - name: Export serverpack @@ -333,7 +333,7 @@ jobs: release: name: Release - needs: [modpack-info, build-cf-modpack, build-serverpack] + needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] if: startsWith(github.ref, 'refs/tags/') uses: ./.github/workflows/release.yml with: From 62c238693d9deb8e38825b87a69e2d9d61330cbe Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 00:57:36 +0500 Subject: [PATCH 05/63] Update build.yml --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64eb85811..b4e624a4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -221,6 +221,7 @@ jobs: with: name: changelog path: CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md + retention-days: 5 # - name: Changelog Parser # id: changelog_full @@ -257,6 +258,7 @@ jobs: with: name: modpack_cf path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip + retention-days: 5 build-mmc-modpack: name: Build MMC Modpack @@ -278,7 +280,7 @@ jobs: run: | git submodule init cd mods - git config --local ${{ secrets.GITHUB_TOKEN }} + git config --global credential.helper '!f() { echo "password=${{ secrets.GITHUB_TOKEN }}"; }; f' git submodule update --recursive - name: Export MMC @@ -294,6 +296,7 @@ jobs: with: name: modpack_mmc path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip + retention-days: 5 build-serverpack: name: Build Serverpack @@ -313,7 +316,7 @@ jobs: run: | git submodule init cd mods - git config --local + git config --global echo "username=Xikaro"; echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; git submodule update --recursive @@ -330,6 +333,7 @@ jobs: with: name: server_pack path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip + retention-days: 5 release: name: Release From 49975e1ffd444586bf6467d19bdb815c3fe8f3a1 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:01:46 +0500 Subject: [PATCH 06/63] 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 b4e624a4c..c60881202 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -280,7 +280,7 @@ jobs: run: | git submodule init cd mods - git config --global credential.helper '!f() { echo "password=${{ secrets.GITHUB_TOKEN }}"; }; f' + git config --global credential.helper '!f() { echo "username=${{ github.triggering_actor }}"; echo "password=${{ secrets.GITHUB_TOKEN }}"; }; f' git submodule update --recursive - name: Export MMC @@ -316,9 +316,9 @@ jobs: run: | git submodule init cd mods - git config --global + git config --global credential.helper '!f() { echo "username=Xikaro"; - echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; + echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' git submodule update --recursive - name: Export serverpack From 765f1407500a5bdc30e0c1dcdaf77a08de4e0a07 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:11:35 +0500 Subject: [PATCH 07/63] Update build.yml --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c60881202..88dd327bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -285,8 +285,8 @@ jobs: - name: Export MMC run: | - cp -r mods overrides/ - mv -vf overrides/ .minecraft/ + mkdir -p .minecraft + mv -r {config,defaultconfigs,kubejs,mods} .minecraft/ mv -vf .github/buildtools/modpack/mmc-pack.json ./ mv -vf .github/buildtools/modpack/instance.cfg ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ @@ -323,7 +323,8 @@ jobs: - name: Export serverpack run: | - cp -r .github/buildtools/serverpack/* .minecraft/ + mkdir -p .minecraft + mv -r {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done cd .minecraft/ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./ From ad5da083fb58570fb7960f47d838303a5e4bbc94 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:14:36 +0500 Subject: [PATCH 08/63] Update build.yml --- .github/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 88dd327bf..386f11ecf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -248,9 +248,9 @@ jobs: - name: Export CF run: | mkdir -p overrides - cp -r {config,defaultconfigs,kubejs} overrides/ - mv -vf .github/buildtools/modpack/manifest.json ./ - mv -vf .github/buildtools/modpack/modlist.html ./ + mv -vf {config,defaultconfigs,kubejs} overrides/ + mv -vf ./.github/buildtools/modpack/manifest.json ./ + mv -vf ./.github/buildtools/modpack/modlist.html ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides - name: Upload zip cf @@ -286,9 +286,9 @@ jobs: - name: Export MMC run: | mkdir -p .minecraft - mv -r {config,defaultconfigs,kubejs,mods} .minecraft/ - mv -vf .github/buildtools/modpack/mmc-pack.json ./ - mv -vf .github/buildtools/modpack/instance.cfg ./ + mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/ + mv -vf ./.github/buildtools/modpack/mmc-pack.json ./ + mv -vf ./.github/buildtools/modpack/instance.cfg ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - name: Upload zip mmc @@ -324,8 +324,8 @@ jobs: - name: Export serverpack run: | mkdir -p .minecraft - mv -r {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft - cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done + mv -r {config,defaultconfigs,kubejs,mods,./.github/buildtools/serverpack/*} .minecraft + cat ./.github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done cd .minecraft/ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./ From 9cd53bbb4a3e4d3b80dcd1f0686b9a5d5473cfbf Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:19:31 +0500 Subject: [PATCH 09/63] manifest --- .github/buildtools/modpack/manifest.json | 814 ++++++++++++----------- .github/buildtools/modpack/modlist.html | 184 ++--- mods | 2 +- 3 files changed, 512 insertions(+), 488 deletions(-) diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index cfdbe50e1..feb733ec5 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -16,13 +16,198 @@ "projectID": 385053, "files": [ { - "projectID": 333287, - "fileID": 4833106, + "projectID": 916493, + "fileID": 4988266, "required": true }, { - "projectID": 257814, - "fileID": 4968955, + "projectID": 663477, + "fileID": 4826822, + "required": true + }, + { + "projectID": 513402, + "fileID": 5007529, + "required": true + }, + { + "projectID": 255389, + "fileID": 4798205, + "required": true + }, + { + "projectID": 511770, + "fileID": 4606615, + "required": true + }, + { + "projectID": 309927, + "fileID": 4985525, + "required": true + }, + { + "projectID": 439890, + "fileID": 4929694, + "required": true + }, + { + "projectID": 238086, + "fileID": 4948967, + "required": true + }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, + { + "projectID": 823106, + "fileID": 4906217, + "required": true + }, + { + "projectID": 890405, + "fileID": 5000343, + "required": true + }, + { + "projectID": 570630, + "fileID": 4936333, + "required": true + }, + { + "projectID": 714158, + "fileID": 4987747, + "required": true + }, + { + "projectID": 317780, + "fileID": 4929640, + "required": true + }, + { + "projectID": 633412, + "fileID": 4685319, + "required": true + }, + { + "projectID": 618298, + "fileID": 4993651, + "required": true + }, + { + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 231095, + "fileID": 4787442, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, + "required": true + }, + { + "projectID": 581495, + "fileID": 4952626, + "required": true + }, + { + "projectID": 240633, + "fileID": 4655091, + "required": true + }, + { + "projectID": 435044, + "fileID": 4596768, + "required": true + }, + { + "projectID": 266890, + "fileID": 4994127, + "required": true + }, + { + "projectID": 263420, + "fileID": 4933782, + "required": true + }, + { + "projectID": 422301, + "fileID": 4993659, + "required": true + }, + { + "projectID": 308240, + "fileID": 4820041, + "required": true + }, + { + "projectID": 636608, + "fileID": 4982660, + "required": true + }, + { + "projectID": 453394, + "fileID": 4976486, + "required": true + }, + { + "projectID": 251407, + "fileID": 4751740, + "required": true + }, + { + "projectID": 665658, + "fileID": 4982356, + "required": true + }, + { + "projectID": 310111, + "fileID": 4951142, + "required": true + }, + { + "projectID": 841001, + "fileID": 4945181, + "required": true + }, + { + "projectID": 223794, + "fileID": 4997114, + "required": true + }, + { + "projectID": 908741, + "fileID": 4984832, + "required": true + }, + { + "projectID": 272335, + "fileID": 4990314, + "required": true + }, + { + "projectID": 254284, + "fileID": 4887789, + "required": true + }, + { + "projectID": 387638, + "fileID": 4691333, + "required": true + }, + { + "projectID": 237307, + "fileID": 4600191, + "required": true + }, + { + "projectID": 288885, + "fileID": 4711423, "required": true }, { @@ -35,319 +220,24 @@ "fileID": 4864329, "required": true }, - { - "projectID": 351441, - "fileID": 4613538, - "required": true - }, - { - "projectID": 272335, - "fileID": 4906607, - "required": true - }, - { - "projectID": 844019, - "fileID": 4893142, - "required": true - }, - { - "projectID": 60089, - "fileID": 4581240, - "required": true - }, { "projectID": 889915, "fileID": 4932157, "required": true }, - { - "projectID": 354353, - "fileID": 4891706, - "required": true - }, - { - "projectID": 927874, - "fileID": 4968758, - "required": true - }, - { - "projectID": 289412, - "fileID": 4929479, - "required": true - }, - { - "projectID": 871755, - "fileID": 4979438, - "required": true - }, - { - "projectID": 422301, - "fileID": 4950566, - "required": true - }, - { - "projectID": 818089, - "fileID": 4872397, - "required": true - }, - { - "projectID": 551894, - "fileID": 4688940, - "required": true - }, - { - "projectID": 237307, - "fileID": 4600191, - "required": true - }, - { - "projectID": 459929, - "fileID": 4936437, - "required": true - }, - { - "projectID": 823106, - "fileID": 4906217, - "required": true - }, - { - "projectID": 401648, - "fileID": 4863626, - "required": true - }, - { - "projectID": 223794, - "fileID": 4857895, - "required": true - }, { "projectID": 256717, "fileID": 4614555, "required": true }, { - "projectID": 665658, - "fileID": 4982356, + "projectID": 411045, + "fileID": 4578649, "required": true }, { - "projectID": 634062, - "fileID": 4610474, - "required": true - }, - { - "projectID": 940350, - "fileID": 4922586, - "required": true - }, - { - "projectID": 251407, - "fileID": 4751740, - "required": true - }, - { - "projectID": 306770, - "fileID": 4966125, - "required": true - }, - { - "projectID": 450659, - "fileID": 4645815, - "required": true - }, - { - "projectID": 538149, - "fileID": 4620037, - "required": true - }, - { - "projectID": 316582, - "fileID": 4973430, - "required": true - }, - { - "projectID": 302973, - "fileID": 4976574, - "required": true - }, - { - "projectID": 260262, - "fileID": 4581167, - "required": true - }, - { - "projectID": 232131, - "fileID": 4635878, - "required": true - }, - { - "projectID": 583345, - "fileID": 4925840, - "required": true - }, - { - "projectID": 254284, - "fileID": 4887789, - "required": true - }, - { - "projectID": 704113, - "fileID": 4831434, - "required": true - }, - { - "projectID": 636608, - "fileID": 4982660, - "required": true - }, - { - "projectID": 790626, - "fileID": 4980929, - "required": true - }, - { - "projectID": 299540, - "fileID": 4711441, - "required": true - }, - { - "projectID": 495476, - "fileID": 4924184, - "required": true - }, - { - "projectID": 714158, - "fileID": 4957376, - "required": true - }, - { - "projectID": 233019, - "fileID": 4578262, - "required": true - }, - { - "projectID": 314905, - "fileID": 4596742, - "required": true - }, - { - "projectID": 365281, - "fileID": 4612683, - "required": true - }, - { - "projectID": 324717, - "fileID": 4973483, - "required": true - }, - { - "projectID": 880532, - "fileID": 4895948, - "required": true - }, - { - "projectID": 387638, - "fileID": 4691333, - "required": true - }, - { - "projectID": 288885, - "fileID": 4711423, - "required": true - }, - { - "projectID": 308240, - "fileID": 4820041, - "required": true - }, - { - "projectID": 570073, - "fileID": 4973823, - "required": true - }, - { - "projectID": 618298, - "fileID": 4950546, - "required": true - }, - { - "projectID": 475117, - "fileID": 4711435, - "required": true - }, - { - "projectID": 453394, - "fileID": 4976486, - "required": true - }, - { - "projectID": 310111, - "fileID": 4951142, - "required": true - }, - { - "projectID": 410811, - "fileID": 4896152, - "required": true - }, - { - "projectID": 635042, - "fileID": 4894852, - "required": true - }, - { - "projectID": 912469, - "fileID": 4956177, - "required": true - }, - { - "projectID": 890405, - "fileID": 4968835, - "required": true - }, - { - "projectID": 633412, - "fileID": 4685319, - "required": true - }, - { - "projectID": 283644, - "fileID": 4913663, - "required": true - }, - { - "projectID": 495693, - "fileID": 4870168, - "required": true - }, - { - "projectID": 513402, - "fileID": 4984527, - "required": true - }, - { - "projectID": 326652, - "fileID": 4979375, - "required": true - }, - { - "projectID": 433760, - "fileID": 4573913, - "required": true - }, - { - "projectID": 292038, - "fileID": 4594106, - "required": true - }, - { - "projectID": 270441, - "fileID": 4578892, - "required": true - }, - { - "projectID": 662156, - "fileID": 4944918, + "projectID": 333287, + "fileID": 4833106, "required": true }, { @@ -356,28 +246,48 @@ "required": true }, { - "projectID": 663477, - "fileID": 4826822, + "projectID": 448233, + "fileID": 4763645, "required": true }, { - "projectID": 551736, - "fileID": 4731947, + "projectID": 257814, + "fileID": 5005088, "required": true }, { - "projectID": 411045, - "fileID": 4578649, + "projectID": 495693, + "fileID": 4870168, "required": true }, { - "projectID": 238086, - "fileID": 4948967, + "projectID": 282001, + "fileID": 5005529, "required": true }, { - "projectID": 943925, - "fileID": 4926070, + "projectID": 927874, + "fileID": 4968758, + "required": true + }, + { + "projectID": 880532, + "fileID": 4895948, + "required": true + }, + { + "projectID": 316582, + "fileID": 4973430, + "required": true + }, + { + "projectID": 662156, + "fileID": 4944918, + "required": true + }, + { + "projectID": 270441, + "fileID": 4578892, "required": true }, { @@ -385,94 +295,59 @@ "fileID": 4663010, "required": true }, - { - "projectID": 531761, - "fileID": 4943500, - "required": true - }, - { - "projectID": 511770, - "fileID": 4606615, - "required": true - }, - { - "projectID": 881248, - "fileID": 4874233, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, - "required": true - }, - { - "projectID": 309927, - "fileID": 4960408, - "required": true - }, - { - "projectID": 416294, - "fileID": 4944325, - "required": true - }, - { - "projectID": 263420, - "fileID": 4933782, - "required": true - }, - { - "projectID": 367706, - "fileID": 4776833, - "required": true - }, - { - "projectID": 908741, - "fileID": 4982727, - "required": true - }, - { - "projectID": 357540, - "fileID": 4699629, - "required": true - }, { "projectID": 688231, "fileID": 4836196, "required": true }, - { - "projectID": 317780, - "fileID": 4929640, - "required": true - }, - { - "projectID": 435044, - "fileID": 4596768, - "required": true - }, - { - "projectID": 448233, - "fileID": 4763645, - "required": true - }, - { - "projectID": 297038, - "fileID": 4969628, - "required": true - }, { "projectID": 429235, "fileID": 4810975, "required": true }, { - "projectID": 521393, - "fileID": 4837449, + "projectID": 297038, + "fileID": 4969628, "required": true }, { - "projectID": 841001, - "fileID": 4945181, + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 306770, + "fileID": 4966125, + "required": true + }, + { + "projectID": 302973, + "fileID": 4976574, + "required": true + }, + { + "projectID": 844019, + "fileID": 4893142, + "required": true + }, + { + "projectID": 289412, + "fileID": 4929479, + "required": true + }, + { + "projectID": 357540, + "fileID": 4699629, + "required": true + }, + { + "projectID": 365281, + "fileID": 4612683, + "required": true + }, + { + "projectID": 433760, + "fileID": 4573913, "required": true }, { @@ -481,8 +356,28 @@ "required": true }, { - "projectID": 654373, - "fileID": 4873766, + "projectID": 348521, + "fileID": 4973441, + "required": true + }, + { + "projectID": 475117, + "fileID": 4711435, + "required": true + }, + { + "projectID": 538149, + "fileID": 4620037, + "required": true + }, + { + "projectID": 790626, + "fileID": 4980929, + "required": true + }, + { + "projectID": 429371, + "fileID": 4884096, "required": true }, { @@ -491,23 +386,148 @@ "required": true }, { - "projectID": 240633, - "fileID": 4655091, + "projectID": 818089, + "fileID": 4872397, "required": true }, { - "projectID": 714059, - "fileID": 4683092, + "projectID": 940350, + "fileID": 4922586, "required": true }, { - "projectID": 916493, - "fileID": 4797195, + "projectID": 526854, + "fileID": 4631193, "required": true }, { - "projectID": 581495, - "fileID": 4952626, + "projectID": 674852, + "fileID": 4828026, + "required": true + }, + { + "projectID": 912469, + "fileID": 4956177, + "required": true + }, + { + "projectID": 283644, + "fileID": 4913663, + "required": true + }, + { + "projectID": 326652, + "fileID": 4979375, + "required": true + }, + { + "projectID": 922713, + "fileID": 4982165, + "required": true + }, + { + "projectID": 410811, + "fileID": 4896152, + "required": true + }, + { + "projectID": 314905, + "fileID": 4596742, + "required": true + }, + { + "projectID": 367706, + "fileID": 4776833, + "required": true + }, + { + "projectID": 531761, + "fileID": 4943500, + "required": true + }, + { + "projectID": 401648, + "fileID": 4863626, + "required": true + }, + { + "projectID": 299540, + "fileID": 4711441, + "required": true + }, + { + "projectID": 551736, + "fileID": 4731947, + "required": true + }, + { + "projectID": 871755, + "fileID": 4999501, + "required": true + }, + { + "projectID": 495476, + "fileID": 4924184, + "required": true + }, + { + "projectID": 416294, + "fileID": 4944325, + "required": true + }, + { + "projectID": 521393, + "fileID": 4837449, + "required": true + }, + { + "projectID": 551894, + "fileID": 4688940, + "required": true + }, + { + "projectID": 634062, + "fileID": 4610474, + "required": true + }, + { + "projectID": 233019, + "fileID": 4578262, + "required": true + }, + { + "projectID": 459929, + "fileID": 4936437, + "required": true + }, + { + "projectID": 943925, + "fileID": 4926070, + "required": true + }, + { + "projectID": 354353, + "fileID": 4891706, + "required": true + }, + { + "projectID": 351441, + "fileID": 4613538, + "required": true + }, + { + "projectID": 654373, + "fileID": 4873766, + "required": true + }, + { + "projectID": 292038, + "fileID": 4594106, + "required": true + }, + { + "projectID": 324717, + "fileID": 4986594, "required": true } ], diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index 6518ab7aa..96960e8c5 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,101 +1,105 @@  diff --git a/mods b/mods index d4cc1ce51..30f401a53 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit d4cc1ce510c68572d2690c1abe36c3ff4e880f55 +Subproject commit 30f401a533106700c8b912af5314d1000b39e5e7 From 9039d1232dcff57dbb90f8389247c0a536ea5ce7 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:30:21 +0500 Subject: [PATCH 10/63] workflows --- .github/workflows/build.yml | 286 +++++++++++++++++----------------- .github/workflows/release.yml | 60 +++---- 2 files changed, 174 insertions(+), 172 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 386f11ecf..c8822dcf6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: project_version: ${{ steps.info.outputs.project_version }} mcversion: ${{ steps.info.outputs.mcversion }} tag: ${{ steps.version.outputs.tag }} - changelog: ${{ steps.mod_changes.outputs.news }} + changelog: ${{ steps.changelog.outputs.description }} steps: - name: Checkout with fetch depth 2 uses: actions/checkout@v4.1.1 @@ -60,174 +60,174 @@ jobs: uses: actions/checkout@v4.1.1 with: fetch-depth: 0 - - name: Process changelog - id: mod_changes - shell: bash - run: | - set +e + # - name: Process changelog + # id: mod_changes + # shell: bash + # run: | + # set +e - curl https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux -o ./pax/jd -L -J - sudo chmod +x ./pax/jd + # curl https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux -o ./pax/jd -L -J + # sudo chmod +x ./pax/jd - manifest="./.github/buildtools/modpackmanifest.json" - changelog="./CHANGELOG.md" + # manifest="./.github/buildtools/modpackmanifest.json" + # changelog="./CHANGELOG.md" - branch=$(git rev-parse --abbrev-ref HEAD) - current_commit=$(git rev-parse --short ${{ github.sha }}) - previous_commit=$(git log -n 1 --skip 1 --pretty=format:"%h" -- $manifest) - latest_commit=$(git log -n 1 --pretty=format:"%h" $branch -- $manifest) - latest_tag=$(git describe --tags --abbrev=0) - latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) + # branch=$(git rev-parse --abbrev-ref HEAD) + # current_commit=$(git rev-parse --short ${{ github.sha }}) + # previous_commit=$(git log -n 1 --skip 1 --pretty=format:"%h" -- $manifest) + # latest_commit=$(git log -n 1 --pretty=format:"%h" $branch -- $manifest) + # latest_tag=$(git describe --tags --abbrev=0) + # latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) - if [ "$latest_tag" = ${{ steps.version.outputs.tag }} ]; then - latest_tag=$(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^) - latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) - fi + # if [ "$latest_tag" = ${{ steps.version.outputs.tag }} ]; then + # latest_tag=$(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^) + # latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) + # fi - if [ "$latest_commit" = "$current_commit" ]; then - echo "changed=true" >> $GITHUB_OUTPUT - else - echo "changed=false" >> $GITHUB_OUTPUT - fi + # if [ "$latest_commit" = "$current_commit" ]; then + # echo "changed=true" >> $GITHUB_OUTPUT + # else + # echo "changed=false" >> $GITHUB_OUTPUT + # fi - echo "branch: $branch" - echo "current commit: $current_commit" - echo "previous commit: $previous_commit" - echo "latest commit: $latest_commit" - echo "latest tagged commit: $latest_tagged_commit" - echo "latest tag: $latest_tag" + # echo "branch: $branch" + # echo "current commit: $current_commit" + # echo "previous commit: $previous_commit" + # echo "latest commit: $latest_commit" + # echo "latest tagged commit: $latest_tagged_commit" + # echo "latest tag: $latest_tag" - RED='\033[0;31m' - GREEN='\033[0;32m' - BLUE='\033[0;36m' - NC='\033[0m' + # RED='\033[0;31m' + # GREEN='\033[0;32m' + # BLUE='\033[0;36m' + # NC='\033[0m' - git show $latest_tagged_commit:$manifest > ./.github/buildtools/modpackmanifest_prev.json - mods_removed_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^-' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') - mods_added_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^+' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') + # git show $latest_tagged_commit:$manifest > ./.github/buildtools/modpackmanifest_prev.json + # mods_removed_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^-' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') + # mods_added_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^+' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') - mods_added="" - mods_removed="" - mods_updated="" + # mods_added="" + # mods_removed="" + # mods_updated="" - mod_changes="" + # mod_changes="" - if [[ ! -z ""$mods_added_raw"" ]]; then - while IFS= read -r line1; do - foo="" - while IFS= read -r line2; do - foo="${line1//$line2}" - if [[ -z ""$foo"" ]]; then - if [[ ! -z ""$mods_updated"" ]]; then - mods_updated+="\n" - fi - mods_updated+="- $line1" - break - fi - done <<< "$mods_removed_raw" - if [[ ! -z ""$foo"" ]]; then - if [[ ! -z ""$mods_added"" ]]; then - mods_added+="\n" - fi - mods_added+="- $foo" - fi - done <<< "$mods_added_raw" - fi + # if [[ ! -z ""$mods_added_raw"" ]]; then + # while IFS= read -r line1; do + # foo="" + # while IFS= read -r line2; do + # foo="${line1//$line2}" + # if [[ -z ""$foo"" ]]; then + # if [[ ! -z ""$mods_updated"" ]]; then + # mods_updated+="\n" + # fi + # mods_updated+="- $line1" + # break + # fi + # done <<< "$mods_removed_raw" + # if [[ ! -z ""$foo"" ]]; then + # if [[ ! -z ""$mods_added"" ]]; then + # mods_added+="\n" + # fi + # mods_added+="- $foo" + # fi + # done <<< "$mods_added_raw" + # fi - if [[ ! -z ""$mods_removed_raw"" ]]; then - while IFS= read -r line1; do - bar="" - while IFS= read -r line2; do - bar="${line1//$line2}" - if [[ -z ""$bar"" ]]; then - break - fi - done <<< "$mods_added_raw" - if [[ ! -z ""$bar"" ]]; then - if [[ ! -z ""$mods_removed"" ]]; then - mods_removed+="\n" - fi - mods_removed+="- $bar" - fi - done <<< "$mods_removed_raw" - fi + # if [[ ! -z ""$mods_removed_raw"" ]]; then + # while IFS= read -r line1; do + # bar="" + # while IFS= read -r line2; do + # bar="${line1//$line2}" + # if [[ -z ""$bar"" ]]; then + # break + # fi + # done <<< "$mods_added_raw" + # if [[ ! -z ""$bar"" ]]; then + # if [[ ! -z ""$mods_removed"" ]]; then + # mods_removed+="\n" + # fi + # mods_removed+="- $bar" + # fi + # done <<< "$mods_removed_raw" + # fi - if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then - echo -e "x---------------x" - echo -e "| Mod Changes |" + # if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then + # echo -e "x---------------x" + # echo -e "| Mod Changes |" - mod_changes+="## Mod Changes\n\n" - mod_changes+="Since: [\`$latest_tag\`]()\n\n" - mod_changes+="\`\`\`markdown\n" - fi + # mod_changes+="## Mod Changes\n\n" + # mod_changes+="Since: [\`$latest_tag\`]()\n\n" + # mod_changes+="\`\`\`markdown\n" + # fi - if [[ ! -z ""$mods_added"" ]]; then - echo -e "${GREEN}Added:" - echo -e "$mods_added" + # if [[ ! -z ""$mods_added"" ]]; then + # echo -e "${GREEN}Added:" + # echo -e "$mods_added" - mod_changes+="Added:\n" - mod_changes+="$mods_added\n" + # mod_changes+="Added:\n" + # mod_changes+="$mods_added\n" - if [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then - mod_changes+="\n" - fi - fi - if [[ ! -z ""$mods_removed"" ]]; then - echo -e "${RED}Removed:" - echo -e "$mods_removed" + # if [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then + # mod_changes+="\n" + # fi + # fi + # if [[ ! -z ""$mods_removed"" ]]; then + # echo -e "${RED}Removed:" + # echo -e "$mods_removed" - mod_changes+="Removed:\n" - mod_changes+="$mods_removed\n" + # mod_changes+="Removed:\n" + # mod_changes+="$mods_removed\n" - if [[ ! -z ""$mods_updated"" ]]; then - mod_changes+="\n" - fi - fi - if [[ ! -z ""$mods_updated"" ]]; then - echo -e "${BLUE}Updated:" - echo -e "$mods_updated" + # if [[ ! -z ""$mods_updated"" ]]; then + # mod_changes+="\n" + # fi + # fi + # if [[ ! -z ""$mods_updated"" ]]; then + # echo -e "${BLUE}Updated:" + # echo -e "$mods_updated" - mod_changes+="Updated:\n" - mod_changes+="$mods_updated\n" - fi + # mod_changes+="Updated:\n" + # mod_changes+="$mods_updated\n" + # fi - if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then - echo -e "${NC}x---------------x" + # if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then + # echo -e "${NC}x---------------x" - mod_changes+="\`\`\`" - fi + # mod_changes+="\`\`\`" + # fi - if [[ ! -z ""$mod_changes"" ]]; then - echo -e "$mod_changes" >> $GITHUB_STEP_SUMMARY - fi + # if [[ ! -z ""$mod_changes"" ]]; then + # echo -e "$mod_changes" >> $GITHUB_STEP_SUMMARY + # fi - # Upload @mod_changes@ - mod_changes=$(echo $mod_changes | sed -r 's/[/]/\\\//g') - perl -i -pe "s/\@mod_changes\@/$mod_changes/g" $changelog + # # Upload @mod_changes@ + # mod_changes=$(echo $mod_changes | sed -r 's/[/]/\\\//g') + # perl -i -pe "s/\@mod_changes\@/$mod_changes/g" $changelog - # Replace @mod_changes@ - mod_changes=$(echo $mod_changes | sed -r 's/\\\\n/\\n/g') - echo "markdown=$mod_changes" >> $GITHUB_OUTPUT + # # Replace @mod_changes@ + # mod_changes=$(echo $mod_changes | sed -r 's/\\\\n/\\n/g') + # echo "markdown=$mod_changes" >> $GITHUB_OUTPUT - rm ./.github/buildtools/modpack/manifest_prev.json + # rm ./.github/buildtools/modpack/manifest_prev.json - # Replace @version@ - perl -i -pe "s/\@version\@/${{ steps.info.outputs.projectsuffix }}/g" $changelog + # # Replace @version@ + # perl -i -pe "s/\@version\@/${{ steps.info.outputs.projectsuffix }}/g" $changelog - # Finally, Rename changelog - mv $changelog CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md - - name: Upload changelog - uses: actions/upload-artifact@v4.0.0 - with: - name: changelog - path: CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md - retention-days: 5 - - # - name: Changelog Parser - # id: changelog_full - # uses: coditory/changelog-parser@v1.0.2 + # # Finally, Rename changelog + # mv $changelog CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md + # - name: Upload changelog + # uses: actions/upload-artifact@v4.0.0 # with: - # path: CHANGELOG.md + # name: changelog + # path: CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md + # retention-days: 5 + + - name: Changelog Parser + id: changelog + uses: coditory/changelog-parser@v1.0.2 + with: + path: CHANGELOG.md build-cf-modpack: name: Build CF Modpack @@ -280,7 +280,9 @@ jobs: run: | git submodule init cd mods - git config --global credential.helper '!f() { echo "username=${{ github.triggering_actor }}"; echo "password=${{ secrets.GITHUB_TOKEN }}"; }; f' + git config --global credential.helper '!f() { + echo "username=Xikaro"; + echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' git submodule update --recursive - name: Export MMC @@ -324,7 +326,7 @@ jobs: - name: Export serverpack run: | mkdir -p .minecraft - mv -r {config,defaultconfigs,kubejs,mods,./.github/buildtools/serverpack/*} .minecraft + mv -vf {config,defaultconfigs,kubejs,mods,./.github/buildtools/serverpack/*} .minecraft cat ./.github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done cd .minecraft/ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e382865c..d75ff7449 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,20 +41,20 @@ jobs: with: name: changelog - - name: Create release - uses: softprops/action-gh-release@v1 - with: - prerelease: false - generate_release_notes: true - name: ${{ inputs.project_version }} - body: ${{ inputs.changelog }} - files: | - ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip - ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - tag_name: ${{ inputs.tag }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Create release + # uses: softprops/action-gh-release@v1 + # with: + # prerelease: false + # generate_release_notes: true + # name: ${{ inputs.project_version }} + # body: ${{ inputs.changelog }} + # files: | + # ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + # ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip + # ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + # tag_name: ${{ inputs.tag }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} release-curseforge: name: Deploy to CurseForge @@ -77,28 +77,28 @@ jobs: with: name: server_pack - - name: Upload Curseforge - id: cf_release - uses: SwitchAlpha/upload-curseforge-modpack-action@master - with: - api-token: ${{ secrets.CF_API_TOKEN }} - project-id: ${{ env.CF_PROJECT_ID }} - modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - changelog: "${{ inputs.changelog }}" - changelog-format: markdown - game-version: ${{ inputs.mcversion }} - display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} - server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - release-type: ${{ env.RELEASE_TYPE }} + # - name: Upload Curseforge + # id: cf_release + # uses: SwitchAlpha/upload-curseforge-modpack-action@master + # with: + # api-token: ${{ secrets.CF_API_TOKEN }} + # project-id: ${{ env.CF_PROJECT_ID }} + # modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + # modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + # changelog: "${{ inputs.changelog }}" + # changelog-format: markdown + # game-version: ${{ inputs.mcversion }} + # display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + # server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + # release-type: ${{ env.RELEASE_TYPE }} - name: Create Discord message id: message shell: bash run: | message="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada:\n" - message+="[CurseForge]() • " - message+="[GitHub]() • " + message+="[CurseForge]() • " + message+="[GitHub]() • " message+="[Issues](<${{ github.repository.svn_url }}/issues>)\n" message+="${{ inputs.changelog }}" echo "markdown=$message" >> $GITHUB_OUTPUT From a486f8a76400130102abd80bcc67a17408892565 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:44:22 +0500 Subject: [PATCH 11/63] 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 c8822dcf6..c4e48a9f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -241,7 +241,7 @@ jobs: shell: bash run: | VERSION=${{ needs.modpack-info.outputs.project_version }} - sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/manifest.json + sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/manifest.json sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/main_menu.txt sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml @@ -249,8 +249,8 @@ jobs: run: | mkdir -p overrides mv -vf {config,defaultconfigs,kubejs} overrides/ - mv -vf ./.github/buildtools/modpack/manifest.json ./ - mv -vf ./.github/buildtools/modpack/modlist.html ./ + mv -vf .github/buildtools/modpack/manifest.json ./ + mv -vf .github/buildtools/modpack/modlist.html ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides - name: Upload zip cf @@ -272,7 +272,7 @@ jobs: shell: bash run: | VERSION=${{ needs.modpack-info.outputs.project_version }} - sed -i -e "s/DEV/${VERSION}/g" ./.github/buildtools/modpack/instance.cfg + 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 @@ -289,8 +289,8 @@ jobs: run: | mkdir -p .minecraft mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/ - mv -vf ./.github/buildtools/modpack/mmc-pack.json ./ - mv -vf ./.github/buildtools/modpack/instance.cfg ./ + mv -vf .github/buildtools/modpack/mmc-pack.json ./ + mv -vf .github/buildtools/modpack/instance.cfg ./ zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - name: Upload zip mmc @@ -326,10 +326,10 @@ jobs: - name: Export serverpack run: | mkdir -p .minecraft - mv -vf {config,defaultconfigs,kubejs,mods,./.github/buildtools/serverpack/*} .minecraft - cat ./.github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done + mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft + cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done cd .minecraft/ - zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./ + zip -r ./${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./ - name: Upload zip uses: actions/upload-artifact@v4.0.0 From 4e51ee0cc1bfb8994a9c868a0061d880f75fd501 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:47:12 +0500 Subject: [PATCH 12/63] =?UTF-8?q?=F0=9F=A9=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .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 c4e48a9f6..51f626a24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -328,8 +328,7 @@ jobs: mkdir -p .minecraft mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - cd .minecraft/ - zip -r ./${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./ + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip .minecraft/* - name: Upload zip uses: actions/upload-artifact@v4.0.0 From 061cc973f525492294e40e688f87e4e6c68f9632 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 01:57:57 +0500 Subject: [PATCH 13/63] workflows --- .github/workflows/build.yml | 8 ++++---- .github/workflows/release.yml | 9 ++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 51f626a24..abcc32cf3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -256,7 +256,7 @@ jobs: - name: Upload zip cf uses: actions/upload-artifact@v4.0.0 with: - name: modpack_cf + name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip retention-days: 5 @@ -296,7 +296,7 @@ jobs: - name: Upload zip mmc uses: actions/upload-artifact@v4.0.0 with: - name: modpack_mmc + name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip retention-days: 5 @@ -333,14 +333,14 @@ jobs: - name: Upload zip uses: actions/upload-artifact@v4.0.0 with: - name: server_pack + name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip retention-days: 5 release: name: Release needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] - if: startsWith(github.ref, 'refs/tags/') + #if: startsWith(github.ref, 'refs/tags/') uses: ./.github/workflows/release.yml with: project_name: ${{ needs.modpack-info.outputs.project_name }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d75ff7449..a64f0400c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,11 +36,6 @@ jobs: pattern: ${{ inputs.project_name }}-${{ inputs.project_version }}-* merge-multiple: true - - name: Download changelog - uses: actions/download-artifact@v4.1.0 - with: - name: changelog - # - name: Create release # uses: softprops/action-gh-release@v1 # with: @@ -70,12 +65,12 @@ jobs: - name: Download modpack uses: actions/download-artifact@v4.1.0 with: - name: modpack_cf + name: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf - name: Download serverpack uses: actions/download-artifact@v4.1.0 with: - name: server_pack + name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server # - name: Upload Curseforge # id: cf_release From f0f6ca43391f15ecd1c051c9f0793e508720edaf Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 02:15:45 +0500 Subject: [PATCH 14/63] Update release.yml --- .github/workflows/release.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a64f0400c..967a6f9ae 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -94,8 +94,7 @@ jobs: message="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada:\n" message+="[CurseForge]() • " message+="[GitHub]() • " - message+="[Issues](<${{ github.repository.svn_url }}/issues>)\n" - message+="${{ inputs.changelog }}" + message+="[Issues]()\n" echo "markdown=$message" >> $GITHUB_OUTPUT - name: Send Discord message @@ -104,7 +103,7 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://github.com/TerraFirmaGreg-Team/.github/tree/main/branding/logo_new_year.png?raw=true" - content: "${{ steps.message.outputs.markdown }}" + content: "${{ steps.message.outputs.markdown }}\n${{ inputs.changelog }}" # release-modrinth: # name: Deploy to Modrinth From 353cff0f822ed817eb299e076b479f309f96a43a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 02:34:40 +0500 Subject: [PATCH 15/63] workflows --- .github/workflows/release.yml | 18 +++++++++++++----- CHANGELOG.md | 1 - 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 967a6f9ae..0ccf5bd6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,9 +33,11 @@ jobs: - name: Download modpack uses: actions/download-artifact@v4.1.0 with: - pattern: ${{ inputs.project_name }}-${{ inputs.project_version }}-* merge-multiple: true + - name: Display structure of downloaded files + run: ls -R ./ + # - name: Create release # uses: softprops/action-gh-release@v1 # with: @@ -91,10 +93,10 @@ jobs: id: message shell: bash run: | - message="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada:\n" - message+="[CurseForge]() • " + message="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada: " + message+="\n[CurseForge]() • " message+="[GitHub]() • " - message+="[Issues]()\n" + message+="[Issues]()" echo "markdown=$message" >> $GITHUB_OUTPUT - name: Send Discord message @@ -102,8 +104,14 @@ jobs: with: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" - avatar_url: "https://github.com/TerraFirmaGreg-Team/.github/tree/main/branding/logo_new_year.png?raw=true" + avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" content: "${{ steps.message.outputs.markdown }}\n${{ inputs.changelog }}" + embeds: | + [ + { + "description": "${{ inputs.changelog }}", + } + ] # release-modrinth: # name: Deploy to Modrinth diff --git a/CHANGELOG.md b/CHANGELOG.md index f00fdeaf1..16f43a4b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,6 @@ - Полублоки, ступени, стены и другие блоки теперь могут осыпаться. - Добавлены бедные и богатые куски руд с их переработкой. - И еще множество всего, чего я забыл. -@mod_changes@ ## [0.3.0] - 26.12.2023 ### Изменения From 23f098d10184c8b4cf059c76c537da600f73e5e3 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 03:24:14 +0500 Subject: [PATCH 16/63] workflows --- .github/workflows/build.yml | 186 +++------------------------------- .github/workflows/release.yml | 23 ++--- CHANGELOG.md | 32 ++++++ 3 files changed, 56 insertions(+), 185 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abcc32cf3..52216b36d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,11 @@ jobs: project_version: ${{ steps.info.outputs.project_version }} mcversion: ${{ steps.info.outputs.mcversion }} tag: ${{ steps.version.outputs.tag }} - changelog: ${{ steps.changelog.outputs.description }} + news: ${{ steps.changelog.outputs.news }} + changelog: ${{ steps.changelog_full.outputs.description }} steps: - - name: Checkout with fetch depth 2 + - name: Checkout uses: actions/checkout@v4.1.1 - with: - fetch-depth: 2 - name: Get tag id: version @@ -56,179 +55,19 @@ jobs: echo "project_version=build.${{ github.run_number }}" >> $GITHUB_OUTPUT fi - - name: Checkout with fetch depth 0 - uses: actions/checkout@v4.1.1 - with: - fetch-depth: 0 - # - name: Process changelog - # id: mod_changes - # shell: bash - # run: | - # set +e - - # curl https://github.com/josephburnett/jd/releases/download/v1.7.1/jd-amd64-linux -o ./pax/jd -L -J - # sudo chmod +x ./pax/jd - - # manifest="./.github/buildtools/modpackmanifest.json" - # changelog="./CHANGELOG.md" - - # branch=$(git rev-parse --abbrev-ref HEAD) - # current_commit=$(git rev-parse --short ${{ github.sha }}) - # previous_commit=$(git log -n 1 --skip 1 --pretty=format:"%h" -- $manifest) - # latest_commit=$(git log -n 1 --pretty=format:"%h" $branch -- $manifest) - # latest_tag=$(git describe --tags --abbrev=0) - # latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) - - # if [ "$latest_tag" = ${{ steps.version.outputs.tag }} ]; then - # latest_tag=$(git describe --tags --abbrev=0 $(git describe --tags --abbrev=0)^) - # latest_tagged_commit=$(git rev-list -n 1 --pretty=format:"%h" $latest_tag | sed -n 2p) - # fi - - # if [ "$latest_commit" = "$current_commit" ]; then - # echo "changed=true" >> $GITHUB_OUTPUT - # else - # echo "changed=false" >> $GITHUB_OUTPUT - # fi - - # echo "branch: $branch" - # echo "current commit: $current_commit" - # echo "previous commit: $previous_commit" - # echo "latest commit: $latest_commit" - # echo "latest tagged commit: $latest_tagged_commit" - # echo "latest tag: $latest_tag" - - # RED='\033[0;31m' - # GREEN='\033[0;32m' - # BLUE='\033[0;36m' - # NC='\033[0m' - - # git show $latest_tagged_commit:$manifest > ./.github/buildtools/modpackmanifest_prev.json - # mods_removed_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^-' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') - # mods_added_raw=$(./pax/jd -set ./.github/buildtools/modpackmanifest_prev.json $manifest | grep '^+' | grep -P -o '"name":[\s]*"\K[^"]*' | tr -d '\[\]') - - # mods_added="" - # mods_removed="" - # mods_updated="" - - # mod_changes="" - - # if [[ ! -z ""$mods_added_raw"" ]]; then - # while IFS= read -r line1; do - # foo="" - # while IFS= read -r line2; do - # foo="${line1//$line2}" - # if [[ -z ""$foo"" ]]; then - # if [[ ! -z ""$mods_updated"" ]]; then - # mods_updated+="\n" - # fi - # mods_updated+="- $line1" - # break - # fi - # done <<< "$mods_removed_raw" - # if [[ ! -z ""$foo"" ]]; then - # if [[ ! -z ""$mods_added"" ]]; then - # mods_added+="\n" - # fi - # mods_added+="- $foo" - # fi - # done <<< "$mods_added_raw" - # fi - - # if [[ ! -z ""$mods_removed_raw"" ]]; then - # while IFS= read -r line1; do - # bar="" - # while IFS= read -r line2; do - # bar="${line1//$line2}" - # if [[ -z ""$bar"" ]]; then - # break - # fi - # done <<< "$mods_added_raw" - # if [[ ! -z ""$bar"" ]]; then - # if [[ ! -z ""$mods_removed"" ]]; then - # mods_removed+="\n" - # fi - # mods_removed+="- $bar" - # fi - # done <<< "$mods_removed_raw" - # fi - - # if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then - # echo -e "x---------------x" - # echo -e "| Mod Changes |" - - # mod_changes+="## Mod Changes\n\n" - # mod_changes+="Since: [\`$latest_tag\`]()\n\n" - # mod_changes+="\`\`\`markdown\n" - # fi - - # if [[ ! -z ""$mods_added"" ]]; then - # echo -e "${GREEN}Added:" - # echo -e "$mods_added" - - # mod_changes+="Added:\n" - # mod_changes+="$mods_added\n" - - # if [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then - # mod_changes+="\n" - # fi - # fi - # if [[ ! -z ""$mods_removed"" ]]; then - # echo -e "${RED}Removed:" - # echo -e "$mods_removed" - - # mod_changes+="Removed:\n" - # mod_changes+="$mods_removed\n" - - # if [[ ! -z ""$mods_updated"" ]]; then - # mod_changes+="\n" - # fi - # fi - # if [[ ! -z ""$mods_updated"" ]]; then - # echo -e "${BLUE}Updated:" - # echo -e "$mods_updated" - - # mod_changes+="Updated:\n" - # mod_changes+="$mods_updated\n" - # fi - - # if [[ ! -z ""$mods_added"" ]] || [[ ! -z ""$mods_removed"" ]] || [[ ! -z ""$mods_updated"" ]]; then - # echo -e "${NC}x---------------x" - - # mod_changes+="\`\`\`" - # fi - - # if [[ ! -z ""$mod_changes"" ]]; then - # echo -e "$mod_changes" >> $GITHUB_STEP_SUMMARY - # fi - - # # Upload @mod_changes@ - # mod_changes=$(echo $mod_changes | sed -r 's/[/]/\\\//g') - # perl -i -pe "s/\@mod_changes\@/$mod_changes/g" $changelog - - # # Replace @mod_changes@ - # mod_changes=$(echo $mod_changes | sed -r 's/\\\\n/\\n/g') - # echo "markdown=$mod_changes" >> $GITHUB_OUTPUT - - # rm ./.github/buildtools/modpack/manifest_prev.json - - # # Replace @version@ - # perl -i -pe "s/\@version\@/${{ steps.info.outputs.projectsuffix }}/g" $changelog - - # # Finally, Rename changelog - # mv $changelog CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md - # - name: Upload changelog - # uses: actions/upload-artifact@v4.0.0 - # with: - # name: changelog - # path: CHANGELOG-${{ steps.info.outputs.projectsuffix }}.md - # retention-days: 5 - - name: Changelog Parser - id: changelog + id: changelog_full uses: coditory/changelog-parser@v1.0.2 with: path: CHANGELOG.md + - name: Extract changes + id: changelog + run: | + changelog_full=${{ steps.changelog_full.outputs.description }} + news=$(echo "$changelog_full" | grep -oP '### Изменения([\s\S]*?)(?=### Новые моды|### Обновленные моды|### Удаленные моды)') + echo news=$news >> $GITHUB_OUTPUT + build-cf-modpack: name: Build CF Modpack runs-on: ubuntu-latest @@ -340,13 +179,14 @@ jobs: release: name: Release needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] - #if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') uses: ./.github/workflows/release.yml with: project_name: ${{ needs.modpack-info.outputs.project_name }} project_version: ${{ needs.modpack-info.outputs.project_version }} mcversion: ${{ needs.modpack-info.outputs.mcversion }} tag: ${{ needs.modpack-info.outputs.tag }} + news: ${{ needs.modpack-info.outputs.news }} changelog: ${{ needs.modpack-info.outputs.changelog }} secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ccf5bd6e..c6f335f5d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,9 @@ on: tag: required: true type: string + news: + required: true + type: string changelog: required: true type: string @@ -93,11 +96,13 @@ jobs: id: message shell: bash run: | - message="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada: " - message+="\n[CurseForge]() • " - message+="[GitHub]() • " - message+="[Issues]()" - echo "markdown=$message" >> $GITHUB_OUTPUT + header="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada:" + echo "header=$header" >> $GITHUB_OUTPUT + + link+="[CurseForge]() • " + link+="[GitHub]() • " + link+="[Issues]()" + echo "link=$link" >> $GITHUB_OUTPUT - name: Send Discord message uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 @@ -105,13 +110,7 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.markdown }}\n${{ inputs.changelog }}" - embeds: | - [ - { - "description": "${{ inputs.changelog }}", - } - ] + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ inputs.news }}" # release-modrinth: # name: Deploy to Modrinth diff --git a/CHANGELOG.md b/CHANGELOG.md index 16f43a4b6..5d8fdea06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,38 @@ - Полублоки, ступени, стены и другие блоки теперь могут осыпаться. - Добавлены бедные и богатые куски руд с их переработкой. - И еще множество всего, чего я забыл. +### Удаленные моды +- TFShips +- smallships +- ad_astra +- botarium +- resourcefulconfig +- resourcefullib +### Новые моды +- AdditionalPlacements +- EnhancedVisuals +- PlayerRevive +- cc-tweaked +- chisels-and-bits +- createaddition +- gcyr +- kubejs-create +- lootjs +- starlight +### Обновленные моды +- CreativeCore -> 2.11.18 +- Cucumber -> 7.0.7 +- FirmaCivilization -> 0.1.10 +- Jade -> 11.7.1 +- TerraFirmaGreg-Core -> 0.2.4 +- appliedenergistics2 -> 15.0.18 +- astikorcarts-redux -> 1.1.7 +- curios -> 5.4.7 +- embeddium -> 0.2.16 +- exposure -> 1.2.2 +- gtceu -> 1.0.19.b +- sophisticatedbackpacks -> 3.19.5.988 +- sophisticatedcore -> 0.5.113.524 ## [0.3.0] - 26.12.2023 ### Изменения From 42219eebcaeebe8bf2a0d37c3f5f1d6d2f193a7c Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 03:37:26 +0500 Subject: [PATCH 17/63] Update release.yml --- .github/workflows/release.yml | 40 ++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c6f335f5d..b7e98bfd6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -77,30 +77,30 @@ jobs: with: name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - # - name: Upload Curseforge - # id: cf_release - # uses: SwitchAlpha/upload-curseforge-modpack-action@master - # with: - # api-token: ${{ secrets.CF_API_TOKEN }} - # project-id: ${{ env.CF_PROJECT_ID }} - # modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - # modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - # changelog: "${{ inputs.changelog }}" - # changelog-format: markdown - # game-version: ${{ inputs.mcversion }} - # display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} - # server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - # release-type: ${{ env.RELEASE_TYPE }} + - name: Upload Curseforge + id: cf_release + uses: SwitchAlpha/upload-curseforge-modpack-action@master + with: + api-token: ${{ secrets.CF_API_TOKEN }} + project-id: ${{ env.CF_PROJECT_ID }} + modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + changelog: "${{ inputs.changelog }}" + changelog-format: markdown + game-version: ${{ inputs.mcversion }} + display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + release-type: ${{ env.RELEASE_TYPE }} - name: Create Discord message id: message shell: bash run: | - header="## **${{ inputs.project_name }}** has been updated to ${{ inputs.project_version }}! :tada:" + header="## **${{ inputs.project_name }}** был обновлен до ${{ inputs.project_version }}! :tada:" echo "header=$header" >> $GITHUB_OUTPUT - link+="[CurseForge]() • " - link+="[GitHub]() • " + link+="[CurseForge]() • " + link+="[GitHub]() • " link+="[Issues]()" echo "link=$link" >> $GITHUB_OUTPUT @@ -110,6 +110,12 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" + embeds: | + [ + { + "allowed_mentions_parse": "1167128822513143848" + } + ] content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ inputs.news }}" # release-modrinth: From e4b4e9677df083c8bc8f6f4db5c63b5956508a77 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 03:41:14 +0500 Subject: [PATCH 18/63] 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 52216b36d..be9fcd4f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: - name: Extract changes id: changelog run: | - changelog_full=${{ steps.changelog_full.outputs.description }} + changelog_full=$(${{ steps.changelog_full.outputs.description }}) news=$(echo "$changelog_full" | grep -oP '### Изменения([\s\S]*?)(?=### Новые моды|### Обновленные моды|### Удаленные моды)') echo news=$news >> $GITHUB_OUTPUT From 4d23468ae44a8876bd1021302e1d2a5d00b3cd66 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 03:43:28 +0500 Subject: [PATCH 19/63] 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 be9fcd4f5..50140859d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,8 +64,7 @@ jobs: - name: Extract changes id: changelog run: | - changelog_full=$(${{ steps.changelog_full.outputs.description }}) - news=$(echo "$changelog_full" | grep -oP '### Изменения([\s\S]*?)(?=### Новые моды|### Обновленные моды|### Удаленные моды)') + news=$(echo "${{ steps.changelog_full.outputs.description }}" | grep -oP '### Изменения([\s\S]*?)(?=### Новые моды|### Обновленные моды|### Удаленные моды)') echo news=$news >> $GITHUB_OUTPUT build-cf-modpack: From e1aca1256f5db196f4fa13be458a05c3a85e59e9 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 03:47:45 +0500 Subject: [PATCH 20/63] 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 50140859d..2398097be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,8 @@ jobs: - name: Extract changes id: changelog run: | - news=$(echo "${{ steps.changelog_full.outputs.description }}" | grep -oP '### Изменения([\s\S]*?)(?=### Новые моды|### Обновленные моды|### Удаленные моды)') + changelog_full=${{ steps.changelog_full.outputs.description }} + news=$(echo "$changelog_full" | awk '/### Изменения/{flag=1; next} /### Новые моды|### Обновленные моды|### Удаленные моды/{flag=0} flag') echo news=$news >> $GITHUB_OUTPUT build-cf-modpack: From 1cdcf31ffadb3fc0a39f076478a7cc10a0d67c0d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 03:55:47 +0500 Subject: [PATCH 21/63] 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 2398097be..edeac5bba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,8 +64,8 @@ jobs: - name: Extract changes id: changelog run: | - changelog_full=${{ steps.changelog_full.outputs.description }} - news=$(echo "$changelog_full" | awk '/### Изменения/{flag=1; next} /### Новые моды|### Обновленные моды|### Удаленные моды/{flag=0} flag') + changelog_full=$(cat ${{ steps.changelog_full.outputs.description }}) + news=$(echo "$changelog" | grep -oPz "(?s)(?<=### Изменения\n)(.*?)(?=\n###)") echo news=$news >> $GITHUB_OUTPUT build-cf-modpack: From 537cf4dcae9446176ee17d99c34d335eedb6adba Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 03:58:57 +0500 Subject: [PATCH 22/63] 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 edeac5bba..6f5a395ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,8 +64,8 @@ jobs: - name: Extract changes id: changelog run: | - changelog_full=$(cat ${{ steps.changelog_full.outputs.description }}) - news=$(echo "$changelog" | grep -oPz "(?s)(?<=### Изменения\n)(.*?)(?=\n###)") + changelog_full="${{ steps.changelog_full.outputs.description }}" + news=$(echo "$changelog_full" | grep -oPz "(?s)(?<=### Изменения\n)(.*?)(?=\n###)") echo news=$news >> $GITHUB_OUTPUT build-cf-modpack: From 5d4b9f14aa3ee7775bbdf879bdc3ef8054106fcb Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 04:08:07 +0500 Subject: [PATCH 23/63] 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 6f5a395ae..f4a2502e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,7 +65,7 @@ jobs: id: changelog run: | changelog_full="${{ steps.changelog_full.outputs.description }}" - news=$(echo "$changelog_full" | grep -oPz "(?s)(?<=### Изменения\n)(.*?)(?=\n###)") + news=$(echo "$changelog_full" | sed -n '/### Изменения/,/###/p') echo news=$news >> $GITHUB_OUTPUT build-cf-modpack: From 03b25d58853d6a9129dba68822ff77476fb20487 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 04:13:53 +0500 Subject: [PATCH 24/63] 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 f4a2502e6..44ac55082 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,8 +65,9 @@ jobs: id: changelog run: | changelog_full="${{ steps.changelog_full.outputs.description }}" - news=$(echo "$changelog_full" | sed -n '/### Изменения/,/###/p') + news=$(echo "$changelog_full" | sed -n '/### Изменения/,/###/p' | sed '$d') echo news=$news >> $GITHUB_OUTPUT + echo "Debug: $news" build-cf-modpack: name: Build CF Modpack From 56b07c2a9bb94d81fdd4ba71bb50b2f08e7876c4 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 04:14:44 +0500 Subject: [PATCH 25/63] Update build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44ac55082..7230b2f91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,6 @@ jobs: changelog_full="${{ steps.changelog_full.outputs.description }}" news=$(echo "$changelog_full" | sed -n '/### Изменения/,/###/p' | sed '$d') echo news=$news >> $GITHUB_OUTPUT - echo "Debug: $news" build-cf-modpack: name: Build CF Modpack From 36ce99d0b7d0a9ec72b98e0a513cb9c7bf782909 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 11:08:16 +0500 Subject: [PATCH 26/63] Update release.yml --- .github/workflows/release.yml | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7e98bfd6..758512d98 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,23 +38,20 @@ jobs: with: merge-multiple: true - - name: Display structure of downloaded files - run: ls -R ./ - - # - name: Create release - # uses: softprops/action-gh-release@v1 - # with: - # prerelease: false - # generate_release_notes: true - # name: ${{ inputs.project_version }} - # body: ${{ inputs.changelog }} - # files: | - # ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - # ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip - # ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - # tag_name: ${{ inputs.tag }} - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create release + uses: softprops/action-gh-release@v1 + with: + prerelease: false + generate_release_notes: true + name: ${{ inputs.project_version }} + body: ${{ inputs.changelog }} + files: | + ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + tag_name: ${{ inputs.tag }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} release-curseforge: name: Deploy to CurseForge @@ -83,8 +80,8 @@ jobs: with: api-token: ${{ secrets.CF_API_TOKEN }} project-id: ${{ env.CF_PROJECT_ID }} - modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + modpack-path: "./${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip" + modpack-server-path: "./${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip" changelog: "${{ inputs.changelog }}" changelog-format: markdown game-version: ${{ inputs.mcversion }} From 109706079680bf60a8e1abe6d1e97a9c5ad02883 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 11:22:43 +0500 Subject: [PATCH 27/63] Update release.yml --- .github/workflows/release.yml | 58 +++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 758512d98..84a7ceaff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,30 +29,6 @@ env: RELEASE_TYPE: "beta" jobs: - release-github: - name: Deploy to GitHub - runs-on: ubuntu-latest - steps: - - name: Download modpack - uses: actions/download-artifact@v4.1.0 - with: - merge-multiple: true - - - name: Create release - uses: softprops/action-gh-release@v1 - with: - prerelease: false - generate_release_notes: true - name: ${{ inputs.project_version }} - body: ${{ inputs.changelog }} - files: | - ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip - ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - tag_name: ${{ inputs.tag }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - release-curseforge: name: Deploy to CurseForge runs-on: ubuntu-latest @@ -64,7 +40,7 @@ jobs: echo '::error::No value found for secret key `CF_API_TOKEN`. See https://docs.github.com/en/actions/security-guides/encrypted-secrets#creating-encrypted-secrets-for-a-repository' && exit 1 fi - - name: Download modpack + - name: Download cf modpack uses: actions/download-artifact@v4.1.0 with: name: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf @@ -74,14 +50,17 @@ jobs: with: name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + - name: Display structure of downloaded files + run: ls -R ./ + - name: Upload Curseforge id: cf_release uses: SwitchAlpha/upload-curseforge-modpack-action@master with: api-token: ${{ secrets.CF_API_TOKEN }} project-id: ${{ env.CF_PROJECT_ID }} - modpack-path: "./${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip" - modpack-server-path: "./${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip" + modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip changelog: "${{ inputs.changelog }}" changelog-format: markdown game-version: ${{ inputs.mcversion }} @@ -115,6 +94,31 @@ jobs: ] content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ inputs.news }}" + release-github: + name: Deploy to GitHub + runs-on: ubuntu-latest + needs: [release-curseforge] + steps: + - name: Download modpack + uses: actions/download-artifact@v4.1.0 + with: + merge-multiple: true + + - name: Create release + uses: softprops/action-gh-release@v1 + with: + prerelease: false + generate_release_notes: true + name: ${{ inputs.project_version }} + body: ${{ inputs.changelog }} + files: | + ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip + ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + tag_name: ${{ inputs.tag }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # release-modrinth: # name: Deploy to Modrinth # runs-on: ubuntu-latest From 711d7fd58204cbb03820abce41bd7e94a52efd9b Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 11:44:09 +0500 Subject: [PATCH 28/63] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 84a7ceaff..72bc2e6d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -55,13 +55,13 @@ jobs: - name: Upload Curseforge id: cf_release - uses: SwitchAlpha/upload-curseforge-modpack-action@master + uses: henkelmax/upload-curseforge-modpack-action@v1.0.0 with: api-token: ${{ secrets.CF_API_TOKEN }} project-id: ${{ env.CF_PROJECT_ID }} modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - changelog: "${{ inputs.changelog }}" + changelog: ${{ inputs.changelog }} changelog-format: markdown game-version: ${{ inputs.mcversion }} display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} From 92da2d60cf236ad49135f373a33592b9f6d6b029 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 11:47:05 +0500 Subject: [PATCH 29/63] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 72bc2e6d4..df355a6e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ on: type: string env: - CF_PROJECT_ID: "399664" + CF_PROJECT_ID: "385053" MODRINTH_PROJECT_ID: "75JuuMzk" RELEASE_TYPE: "beta" @@ -55,7 +55,7 @@ jobs: - name: Upload Curseforge id: cf_release - uses: henkelmax/upload-curseforge-modpack-action@v1.0.0 + uses: SwitchAlpha/upload-curseforge-modpack-action@master with: api-token: ${{ secrets.CF_API_TOKEN }} project-id: ${{ env.CF_PROJECT_ID }} From b052112f3e56653b5c78820f0acaed4b44651210 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 11:51:20 +0500 Subject: [PATCH 30/63] Update release.yml --- .github/workflows/release.yml | 40 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df355a6e9..017de5d02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,23 +50,20 @@ jobs: with: name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - - name: Display structure of downloaded files - run: ls -R ./ - - - name: Upload Curseforge - id: cf_release - uses: SwitchAlpha/upload-curseforge-modpack-action@master - with: - api-token: ${{ secrets.CF_API_TOKEN }} - project-id: ${{ env.CF_PROJECT_ID }} - modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - changelog: ${{ inputs.changelog }} - changelog-format: markdown - game-version: ${{ inputs.mcversion }} - display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} - server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - release-type: ${{ env.RELEASE_TYPE }} + # - name: Upload Curseforge + # id: cf_release + # uses: SwitchAlpha/upload-curseforge-modpack-action@master + # with: + # api-token: ${{ secrets.CF_API_TOKEN }} + # project-id: ${{ env.CF_PROJECT_ID }} + # modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + # modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + # changelog: ${{ inputs.changelog }} + # changelog-format: markdown + # game-version: ${{ inputs.mcversion }} + # display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + # server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + # release-type: ${{ env.RELEASE_TYPE }} - name: Create Discord message id: message @@ -75,7 +72,7 @@ jobs: header="## **${{ inputs.project_name }}** был обновлен до ${{ inputs.project_version }}! :tada:" echo "header=$header" >> $GITHUB_OUTPUT - link+="[CurseForge]() • " + link+="[CurseForge]() • " link+="[GitHub]() • " link+="[Issues]()" echo "link=$link" >> $GITHUB_OUTPUT @@ -86,18 +83,11 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - embeds: | - [ - { - "allowed_mentions_parse": "1167128822513143848" - } - ] content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ inputs.news }}" release-github: name: Deploy to GitHub runs-on: ubuntu-latest - needs: [release-curseforge] steps: - name: Download modpack uses: actions/download-artifact@v4.1.0 From e0a88092011f64c40283c68b36adeec0cc685b1a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:24:44 +0500 Subject: [PATCH 31/63] workflows --- .github/workflows/build.yml | 208 +++++++++++++++++++--------------- .github/workflows/release.yml | 30 ++--- 2 files changed, 130 insertions(+), 108 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7230b2f91..c87d955ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,117 +68,139 @@ jobs: news=$(echo "$changelog_full" | sed -n '/### Изменения/,/###/p' | sed '$d') echo news=$news >> $GITHUB_OUTPUT - build-cf-modpack: - name: Build CF Modpack - runs-on: ubuntu-latest - needs: [modpack-info] - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - - name: Replace strings + - name: Create Discord message + id: message shell: bash run: | - VERSION=${{ needs.modpack-info.outputs.project_version }} - sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/manifest.json - sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/main_menu.txt - sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + header="## **${{ steps.info.outputs.project_name }}** был обновлен до ${{ steps.info.outputs.project_version }}! :tada:" + echo "header=$header" >> $GITHUB_OUTPUT - - name: Export CF - run: | - mkdir -p overrides - mv -vf {config,defaultconfigs,kubejs} overrides/ - mv -vf .github/buildtools/modpack/manifest.json ./ - mv -vf .github/buildtools/modpack/modlist.html ./ - zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides + link+="[CurseForge]() • " + link+="[GitHub]() • " + link+="[Issues]()" + echo "link=$link" >> $GITHUB_OUTPUT - - name: Upload zip cf - uses: actions/upload-artifact@v4.0.0 + - name: Send Discord message + uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip - retention-days: 5 + key: "${{secrets.RELEASES_1_20}}" + username: "TerraFirmaGreg" + avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.info.outputs.news }}" - build-mmc-modpack: - name: Build MMC Modpack - runs-on: ubuntu-latest - needs: [modpack-info] - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 + # build-cf-modpack: + # name: Build CF Modpack + # runs-on: ubuntu-latest + # needs: [modpack-info] + # steps: + # - name: Checkout + # uses: actions/checkout@v4.1.1 - - name: Replace strings - shell: bash - run: | - VERSION=${{ needs.modpack-info.outputs.project_version }} - 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 + # - name: Replace strings + # shell: bash + # run: | + # VERSION=${{ needs.modpack-info.outputs.project_version }} + # sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/manifest.json + # sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/main_menu.txt + # sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml - - name: Download Mods - run: | - git submodule init - cd mods - git config --global credential.helper '!f() { - echo "username=Xikaro"; - echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' - git submodule update --recursive + # - name: Export CF + # run: | + # mkdir -p overrides + # mv -vf {config,defaultconfigs,kubejs} overrides/ + # mv -vf .github/buildtools/modpack/manifest.json ./ + # mv -vf .github/buildtools/modpack/modlist.html ./ + # zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides - - name: Export MMC - run: | - mkdir -p .minecraft - mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/ - mv -vf .github/buildtools/modpack/mmc-pack.json ./ - mv -vf .github/buildtools/modpack/instance.cfg ./ - zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ + # - name: Upload zip cf + # uses: actions/upload-artifact@v4.0.0 + # with: + # name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf + # path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip + # retention-days: 5 + + # build-mmc-modpack: + # name: Build MMC Modpack + # runs-on: ubuntu-latest + # needs: [modpack-info] + # steps: + # - name: Checkout + # uses: actions/checkout@v4.1.1 + + # - name: Replace strings + # shell: bash + # run: | + # VERSION=${{ needs.modpack-info.outputs.project_version }} + # 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 + + # - name: Download Mods + # run: | + # git submodule init + # cd mods + # git config --global credential.helper '!f() { + # echo "username=Xikaro"; + # echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' + # git submodule update --recursive + + # - name: Export MMC + # run: | + # mkdir -p .minecraft + # mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/ + # mv -vf .github/buildtools/modpack/mmc-pack.json ./ + # mv -vf .github/buildtools/modpack/instance.cfg ./ + # zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - - name: Upload zip mmc - uses: actions/upload-artifact@v4.0.0 - with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip - retention-days: 5 + # - name: Upload zip mmc + # uses: actions/upload-artifact@v4.0.0 + # with: + # name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc + # path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip + # retention-days: 5 - build-serverpack: - name: Build Serverpack - runs-on: ubuntu-latest - needs: [modpack-info] - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 + # build-serverpack: + # name: Build Serverpack + # runs-on: ubuntu-latest + # needs: [modpack-info] + # steps: + # - name: Checkout + # uses: actions/checkout@v4.1.1 - - name: Replace strings - shell: bash - run: | - VERSION=${{ needs.modpack-info.outputs.project_version }} - sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + # - name: Replace strings + # shell: bash + # run: | + # VERSION=${{ needs.modpack-info.outputs.project_version }} + # sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml - - name: Download Mods - run: | - git submodule init - cd mods - git config --global credential.helper '!f() { - echo "username=Xikaro"; - echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' - git submodule update --recursive + # - name: Download Mods + # run: | + # git submodule init + # cd mods + # git config --global credential.helper '!f() { + # echo "username=Xikaro"; + # echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' + # git submodule update --recursive - - name: Export serverpack - run: | - mkdir -p .minecraft - mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft - cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip .minecraft/* + # - name: Export serverpack + # run: | + # mkdir -p .minecraft + # mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft + # cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done + # zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip .minecraft/* - - name: Upload zip - uses: actions/upload-artifact@v4.0.0 - with: - name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server - path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip - retention-days: 5 + # - name: Upload zip + # uses: actions/upload-artifact@v4.0.0 + # with: + # name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server + # path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip + # retention-days: 5 + + #, build-cf-modpack, build-mmc-modpack, build-serverpack release: name: Release - needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] + needs: [modpack-info] if: startsWith(github.ref, 'refs/tags/') uses: ./.github/workflows/release.yml with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 017de5d02..0abc11ccf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,20 +50,20 @@ jobs: with: name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - # - name: Upload Curseforge - # id: cf_release - # uses: SwitchAlpha/upload-curseforge-modpack-action@master - # with: - # api-token: ${{ secrets.CF_API_TOKEN }} - # project-id: ${{ env.CF_PROJECT_ID }} - # modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip - # modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip - # changelog: ${{ inputs.changelog }} - # changelog-format: markdown - # game-version: ${{ inputs.mcversion }} - # display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} - # server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server - # release-type: ${{ env.RELEASE_TYPE }} + - name: Upload Curseforge + id: cf_release + uses: SwitchAlpha/upload-curseforge-modpack-action@master + with: + api-token: ${{ secrets.CF_API_TOKEN }} + project-id: ${{ env.CF_PROJECT_ID }} + modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip + modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip + changelog: ${{ inputs.changelog }} + changelog-format: markdown + game-version: ${{ inputs.mcversion }} + display-name: ${{ inputs.project_name }}-${{ inputs.project_version }} + server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server + release-type: ${{ env.RELEASE_TYPE }} - name: Create Discord message id: message @@ -72,7 +72,7 @@ jobs: header="## **${{ inputs.project_name }}** был обновлен до ${{ inputs.project_version }}! :tada:" echo "header=$header" >> $GITHUB_OUTPUT - link+="[CurseForge]() • " + link+="[CurseForge]() • " link+="[GitHub]() • " link+="[Issues]()" echo "link=$link" >> $GITHUB_OUTPUT From 0e0e18bfac175907695f30e585a5db1f45c05896 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:26:13 +0500 Subject: [PATCH 32/63] 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 c87d955ca..b1c83cbce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.info.outputs.news }}" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog.outputs.news }}" # build-cf-modpack: # name: Build CF Modpack From 6e299967f038bc83b1cd33b6d3b08812ad99b61c Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:42:22 +0500 Subject: [PATCH 33/63] Update build.yml --- .github/workflows/build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1c83cbce..5638992cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,13 +61,25 @@ jobs: with: path: CHANGELOG.md - - name: Extract changes + - name: Process changelog id: changelog + shell: bash run: | + echo "This is a markdown file" > CHANGELOG-${{ steps.info.outputs.project_version }}.md + changelog_full="${{ steps.changelog_full.outputs.description }}" news=$(echo "$changelog_full" | sed -n '/### Изменения/,/###/p' | sed '$d') + echo news=$news >> CHANGELOG-${{ steps.info.outputs.project_version }}.md + echo news=$news >> $GITHUB_OUTPUT + - name: Upload changelog + uses: actions/upload-artifact@v3 + with: + name: changelog + path: CHANGELOG-${{ steps.info.outputs.project_version }}.md + + - name: Create Discord message id: message shell: bash From 50f90c4230a94a9bddfd222c5f41dcbbb7f0f665 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:45:38 +0500 Subject: [PATCH 34/63] 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 5638992cf..5cd8f691c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,11 +65,11 @@ jobs: id: changelog shell: bash run: | - echo "This is a markdown file" > CHANGELOG-${{ steps.info.outputs.project_version }}.md + touch CHANGELOG-${{ steps.info.outputs.project_version }}.md changelog_full="${{ steps.changelog_full.outputs.description }}" - news=$(echo "$changelog_full" | sed -n '/### Изменения/,/###/p' | sed '$d') - echo news=$news >> CHANGELOG-${{ steps.info.outputs.project_version }}.md + news=$(echo -e "$changelog_full" | sed -n '/### Изменения/,/###/p' | sed '$d') + echo $news >> CHANGELOG-${{ steps.info.outputs.project_version }}.md echo news=$news >> $GITHUB_OUTPUT From d97ae0da672bb57463c341369c8e93a33d2a2341 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:47:51 +0500 Subject: [PATCH 35/63] 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 5cd8f691c..a0f3cfab2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,8 +67,7 @@ jobs: run: | touch CHANGELOG-${{ steps.info.outputs.project_version }}.md - changelog_full="${{ steps.changelog_full.outputs.description }}" - news=$(echo -e "$changelog_full" | sed -n '/### Изменения/,/###/p' | sed '$d') + news=$(echo -e "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') echo $news >> CHANGELOG-${{ steps.info.outputs.project_version }}.md echo news=$news >> $GITHUB_OUTPUT From f848ac112d0d0dbe2a816533ce69f6f37eb3b2ac Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:50:49 +0500 Subject: [PATCH 36/63] Update build.yml --- .github/workflows/build.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0f3cfab2..b4848b785 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,8 +67,8 @@ jobs: run: | touch CHANGELOG-${{ steps.info.outputs.project_version }}.md - news=$(echo -e "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - echo $news >> CHANGELOG-${{ steps.info.outputs.project_version }}.md + news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') + printf "%s" "$news" >> CHANGELOG-${{ steps.info.outputs.project_version }}.md echo news=$news >> $GITHUB_OUTPUT @@ -77,6 +77,12 @@ jobs: with: name: changelog path: CHANGELOG-${{ steps.info.outputs.project_version }}.md + + - name: Changelog Parser + id: changelog_news + uses: coditory/changelog-parser@v1.0.2 + with: + path: CHANGELOG-${{ steps.info.outputs.project_version }}.md - name: Create Discord message @@ -97,7 +103,7 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog.outputs.news }}" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog_news.outputs.description }}" # build-cf-modpack: # name: Build CF Modpack From 0f428fd15e5d8562f80435314900e67543e85311 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:52:47 +0500 Subject: [PATCH 37/63] Update build.yml --- .github/workflows/build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b4848b785..355ffa3f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,14 +77,7 @@ jobs: with: name: changelog path: CHANGELOG-${{ steps.info.outputs.project_version }}.md - - - name: Changelog Parser - id: changelog_news - uses: coditory/changelog-parser@v1.0.2 - with: - path: CHANGELOG-${{ steps.info.outputs.project_version }}.md - - name: Create Discord message id: message shell: bash @@ -103,7 +96,7 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog_news.outputs.description }}" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog.outputs.news }}" # build-cf-modpack: # name: Build CF Modpack From f2d4845748d21539b03f718ab8d4c4f572c2d524 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 12:57:43 +0500 Subject: [PATCH 38/63] Update build.yml --- .github/workflows/build.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 355ffa3f1..ec55898b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,19 +65,10 @@ jobs: id: changelog shell: bash run: | - touch CHANGELOG-${{ steps.info.outputs.project_version }}.md - news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - printf "%s" "$news" >> CHANGELOG-${{ steps.info.outputs.project_version }}.md - - echo news=$news >> $GITHUB_OUTPUT - - - name: Upload changelog - uses: actions/upload-artifact@v3 - with: - name: changelog - path: CHANGELOG-${{ steps.info.outputs.project_version }}.md + printf "news=%s\n" "$news" >> $GITHUB_OUTPUT + - name: Create Discord message id: message shell: bash @@ -90,13 +81,16 @@ jobs: link+="[Issues]()" echo "link=$link" >> $GITHUB_OUTPUT + news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') + printf "news=%s\n" "$news" >> $GITHUB_OUTPUT + - name: Send Discord message uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 with: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog.outputs.news }}" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.message.outputs.news }}" # build-cf-modpack: # name: Build CF Modpack From 4809f31ef19894cfe0f15882615f74f73691d774 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 13:05:41 +0500 Subject: [PATCH 39/63] Update build.yml --- .github/workflows/build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec55898b7..6b595fb5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: shell: bash run: | news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - printf "news=%s\n" "$news" >> $GITHUB_OUTPUT + printf "%s\n" "news=$news" >> $GITHUB_OUTPUT - name: Create Discord message @@ -81,16 +81,13 @@ jobs: link+="[Issues]()" echo "link=$link" >> $GITHUB_OUTPUT - news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - printf "news=%s\n" "$news" >> $GITHUB_OUTPUT - - name: Send Discord message uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 with: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.message.outputs.news }}" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog_news.outputs.news }}" # build-cf-modpack: # name: Build CF Modpack From 046f24076c4feb886d36a48d01a9a5444551e060 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 13:06:37 +0500 Subject: [PATCH 40/63] 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 6b595fb5b..a4e6caa95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,7 @@ jobs: shell: bash run: | news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - printf "%s\n" "news=$news" >> $GITHUB_OUTPUT + printf "%s" "news=$news" >> $GITHUB_OUTPUT - name: Create Discord message From d99dd37e95dec54adb4257018cc36aa128b72ea9 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 13:08:36 +0500 Subject: [PATCH 41/63] Update build.yml --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a4e6caa95..ac526e986 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,7 @@ jobs: - name: Modpack info id: info + shell: bash run: | set +e @@ -65,7 +66,9 @@ jobs: id: changelog shell: bash run: | + set +e news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') + printf "%s" "news=$news" printf "%s" "news=$news" >> $GITHUB_OUTPUT From 7c3bc1206c61704caf25f920820fbbc7523f5d50 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 13:22:02 +0500 Subject: [PATCH 42/63] 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 ac526e986..b16f54228 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: set +e news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') printf "%s" "news=$news" - printf "%s" "news=$news" >> $GITHUB_OUTPUT + echo -e "news=$news" >> $GITHUB_OUTPUT - name: Create Discord message @@ -90,7 +90,7 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog_news.outputs.news }}" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog.outputs.news }}" # build-cf-modpack: # name: Build CF Modpack From a519e09794044c00a60077a9191e6ef65a210ad0 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 13:51:04 +0500 Subject: [PATCH 43/63] Update build.yml --- .github/workflows/build.yml | 44 +++++++++++++++---------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b16f54228..9e0abd68d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,28 +61,21 @@ jobs: uses: coditory/changelog-parser@v1.0.2 with: path: CHANGELOG.md - - - name: Process changelog - id: changelog - shell: bash - run: | - set +e - news=$(printf "%s" "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - printf "%s" "news=$news" - echo -e "news=$news" >> $GITHUB_OUTPUT - - name: Create Discord message id: message shell: bash run: | header="## **${{ steps.info.outputs.project_name }}** был обновлен до ${{ steps.info.outputs.project_version }}! :tada:" - echo "header=$header" >> $GITHUB_OUTPUT + echo -e "header=$header" >> $GITHUB_OUTPUT link+="[CurseForge]() • " link+="[GitHub]() • " link+="[Issues]()" - echo "link=$link" >> $GITHUB_OUTPUT + echo -e "link=$link" >> $GITHUB_OUTPUT + + news=$(echo -e "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') + echo -e "news=$news" >> $GITHUB_OUTPUT - name: Send Discord message uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 @@ -200,19 +193,18 @@ jobs: # path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip # retention-days: 5 - #, build-cf-modpack, build-mmc-modpack, build-serverpack - release: - name: Release - needs: [modpack-info] - if: startsWith(github.ref, 'refs/tags/') - uses: ./.github/workflows/release.yml - with: - project_name: ${{ needs.modpack-info.outputs.project_name }} - project_version: ${{ needs.modpack-info.outputs.project_version }} - mcversion: ${{ needs.modpack-info.outputs.mcversion }} - tag: ${{ needs.modpack-info.outputs.tag }} - news: ${{ needs.modpack-info.outputs.news }} - changelog: ${{ needs.modpack-info.outputs.changelog }} - secrets: inherit + # release: + # name: Release + # needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] + # if: startsWith(github.ref, 'refs/tags/') + # uses: ./.github/workflows/release.yml + # with: + # project_name: ${{ needs.modpack-info.outputs.project_name }} + # project_version: ${{ needs.modpack-info.outputs.project_version }} + # mcversion: ${{ needs.modpack-info.outputs.mcversion }} + # tag: ${{ needs.modpack-info.outputs.tag }} + # news: ${{ needs.modpack-info.outputs.news }} + # changelog: ${{ needs.modpack-info.outputs.changelog }} + # secrets: inherit From e1e8f02031f08d2e3daab748cc5e54122c1f5685 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 13:55:07 +0500 Subject: [PATCH 44/63] 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 9e0abd68d..ea440b7c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: echo -e "link=$link" >> $GITHUB_OUTPUT news=$(echo -e "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - echo -e "news=$news" >> $GITHUB_OUTPUT + printf "%s\n" "news=$news" >> $GITHUB_OUTPUT - name: Send Discord message uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 From b2dd20410c00f2070bba5ab3febe561f35fdddd1 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 14:03:01 +0500 Subject: [PATCH 45/63] 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 ea440b7c8..8cd10527e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,7 @@ jobs: key: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.changelog.outputs.news }}" + content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.message.outputs.news }}" # build-cf-modpack: # name: Build CF Modpack From 00c8ddbb44ef5732a74c12807cfbc182c0d5c196 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 15:39:26 +0500 Subject: [PATCH 46/63] Update main_menu.txt --- config/fancymenu/customization/main_menu.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt index bfd282f56..954799c42 100644 --- a/config/fancymenu/customization/main_menu.txt +++ b/config/fancymenu/customization/main_menu.txt @@ -233,7 +233,7 @@ customization { customization { orientation = mid-centered restartbackgroundanimations = true - buttonaction = joinserver;tfg2.tfg.su%btnaction_splitter_fm% + buttonaction = joinserver;tfg2.terrafirmagreg.su%btnaction_splitter_fm% backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png label = Offical Server loopbackgroundanimations = true From 064ad23a11cd60fde851915f23f1c144320d3e01 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 15:40:04 +0500 Subject: [PATCH 47/63] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 30f401a53..90375de0e 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 30f401a533106700c8b912af5314d1000b39e5e7 +Subproject commit 90375de0e18dda6ede598136b9307ebd4f592962 From 2e621485a393d961113579c5847ea83c393611e5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 5 Jan 2024 18:27:10 +0700 Subject: [PATCH 48/63] config work --- .gitignore | 2 + config/chiselsandbits-client.toml | 114 ------------------------------ config/chiselsandbits-common.toml | 22 ------ config/jade/sort-order.json | 8 +-- config/smallships-client.toml | 28 -------- config/smallships-common.toml | 88 ----------------------- 6 files changed, 6 insertions(+), 256 deletions(-) delete mode 100644 config/chiselsandbits-client.toml delete mode 100644 config/chiselsandbits-common.toml delete mode 100644 config/smallships-client.toml delete mode 100644 config/smallships-common.toml diff --git a/.gitignore b/.gitignore index 43a31fe38..ced8fa48b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,8 @@ config/oculus.properties config/smoothboot.json config/fml.toml config/forge-client.toml +config/chiselsandbits-client.toml +config/chiselsandbits-common.toml # .minecraft crash-reports/* diff --git a/config/chiselsandbits-client.toml b/config/chiselsandbits-client.toml deleted file mode 100644 index ae44140a4..000000000 --- a/config/chiselsandbits-client.toml +++ /dev/null @@ -1,114 +0,0 @@ - -[settings] - #mod.scena.config.settings.invert-pick-block-behaviour.comment - invert-pick-block-behaviour = false - - [settings.bit-bag] - #mod.scena.config.settings.bit-bag.invert-durability-bar-indication.comment - invert-durability-bar-indication = false - - [settings.placement] - - [settings.placement.render-mode] - #mod.scena.config.settings.placement.render-mode.success.comment - #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME - success = "GHOST_BLOCK_MODEL" - #mod.scena.config.settings.placement.render-mode.failed.comment - #Allowed Values: GHOST_BLOCK_MODEL, GHOST_BLOCK_MODEL_SOLID_COLOR, WIREFRAME - failed = "GHOST_BLOCK_MODEL_SOLID_COLOR" - - [settings.placement.color] - #mod.scena.config.settings.placement.color.success.comment - success = [0.1882352977991104, 0.47058823704719543, 0.7882353067398071, 0.7058823704719543] - #mod.scena.config.settings.placement.color.not-fitting.comment - not-fitting = [0.7176470756530762, 0.2549019753932953, 0.054901961237192154, 0.7058823704719543] - #mod.scena.config.settings.placement.color.missing-bits-or-space.comment - missing-bits-or-space = [1.0, 0.8588235378265381, 0.3450980484485626, 0.7058823704719543] - - [settings.chiseling-previews] - #mod.scena.config.settings.chiseling-previews.renderer.comment - renderer = "chiselsandbits:default" - - [settings.chiseling-previews.default] - - [settings.chiseling-previews.default.colors] - #mod.scena.config.settings.chiseling-previews.default.colors.chiseling.comment - chiseling = [0.8500000238418579, 0.0, 0.0, 0.6499999761581421] - #mod.scena.config.settings.chiseling-previews.default.colors.placement.comment - placement = [0.0, 0.8500000238418579, 0.0, 0.6499999761581421] - - [settings.chiseling-previews.debug] - #mod.scena.config.settings.chiseling-previews.debug.enabled.comment - enabled = false - - [settings.chiseling-previews.debug.mutator] - - [settings.chiseling-previews.debug.mutator.colors] - #mod.scena.config.settings.chiseling-previews.debug.mutator.colors.chiseling.comment - chiseling = [0.0, 0.0, 0.8500000238418579, 0.6499999761581421] - #mod.scena.config.settings.chiseling-previews.debug.mutator.colors.placement.comment - placement = [0.8500000238418579, 0.8500000238418579, 0.0, 0.6499999761581421] - - [settings.selected-tool-mode-icons] - #mod.scena.config.settings.selected-tool-mode-icons.renderer.comment - renderer = "chiselsandbits:group" - - [settings.clipboard] - #mod.scena.config.settings.clipboard.size.comment - #Range: 0 ~ 64 - size = 64 - #mod.scena.config.settings.clipboard.add-broken-blocks.comment - add-broken-blocks = true - #mod.scena.config.settings.clipboard.add-picked-blocks.comment - add-picked-blocks = true - - [settings.patterns] - #mod.scena.config.settings.patterns.export-path.comment - export-path = "./chiselsandbits/patterns" - - [settings.warnings] - #mod.scena.config.settings.warnings.show-cool-down-error.comment - show-cool-down-error = false - - [settings.interactions] - #mod.scena.config.settings.interactions.scrolling-changes-mode.comment - scrolling-changes-mode = true - -[performance] - - [performance.caches] - - [performance.caches.sizes] - #mod.scena.config.performance.caches.sizes.bit-storage-content-models.comment - #Range: 0 ~ 9223372036854775807 - bit-storage-content-models = 100 - #mod.scena.config.performance.caches.sizes.block-models.comment - #Range: 3500 ~ 20000 - block-models = 3500 - #mod.scena.config.performance.caches.sizes.block-faces.comment - #Range: 350000 ~ 2000000 - block-faces = 1000000 - #mod.scena.config.performance.caches.sizes.cull-testing.comment - #Range: 3500 ~ 200000 - cull-testing = 3500 - #mod.scena.config.performance.caches.sizes.stack-models.comment - #Range: 0 ~ 9223372036854775807 - stack-models = 100 - - [performance.lighting] - #mod.scena.config.performance.lighting.extract-lighting-values-from-faces.comment - extract-lighting-values-from-faces = true - #mod.scena.config.performance.lighting.extract-lighting-values-from-blockstates.comment - extract-lighting-values-from-blockstates = false - - [performance.model-building] - #mod.scena.config.performance.model-building.thread-count.comment - #Range: 1 ~ 32 - thread-count = 10 - -[gui] - - [gui.radial-menu] - #mod.scena.config.gui.radial-menu.display-mouse-indicator.comment - display-mouse-indicator = false - diff --git a/config/chiselsandbits-common.toml b/config/chiselsandbits-common.toml deleted file mode 100644 index d611b473f..000000000 --- a/config/chiselsandbits-common.toml +++ /dev/null @@ -1,22 +0,0 @@ - -[help] - #mod.scena.config.help.enabled-in-tooltips.comment - enabled-in-tooltips = true - -[performance] - - [performance.caches] - - [performance.caches.sizes] - #mod.scena.config.performance.caches.sizes.collision-boxes.comment - #Range: 0 ~ 9223372036854775807 - collision-boxes = 10000 - #mod.scena.config.performance.caches.sizes.class-metadata.comment - #Range: 0 ~ 9223372036854775807 - class-metadata = 10000 - - [performance.saving] - #mod.scena.config.performance.saving.thread-count.comment - #Range: 1 ~ 32 - thread-count = 10 - diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index db48d9a24..e9522eb84 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -157,10 +157,6 @@ "create:exact_block": null, "create:filter": null, "create:goggles": null, - "gtceu:electric_container_provider": null, - "gtceu:workable_provider": null, - "gtceu:controllable_provider": null, - "gtceu:recipe_logic_provider": null, "tfc:barrel": null, "tfc:bellows": null, "tfc:sapling": null, @@ -210,6 +206,10 @@ "tfc:ocelot": null, "tfc:rabbit": null, "tfc:fishing_hook": null, + "gtceu:electric_container_provider": null, + "gtceu:workable_provider": null, + "gtceu:controllable_provider": null, + "gtceu:recipe_logic_provider": null, "minecraft:brewing_stand": null, "minecraft:beehive": null, "minecraft:command_block": null, diff --git a/config/smallships-client.toml b/config/smallships-client.toml deleted file mode 100644 index 5ace4a541..000000000 --- a/config/smallships-client.toml +++ /dev/null @@ -1,28 +0,0 @@ -# This holds the schematic version for internal purposes. DO NOT TOUCH! -schematicVersion = 1 - -# This category holds configs that define ship behaviour. -[Ship] - - #This category holds configs that define general ship behaviour. - [Ship.General] - - #General camera settings for ships. - [Ship.General.Camera] - #Automatically enable third person camera when entering a ship. - shipGeneralCameraAutoThirdPerson = true - - #Zoom camera settings for third person view in ships. - [Ship.General.Camera.Zoom] - #Generally enable the zooming feature. - shipGeneralCameraZoomEnable = true - #Set maximum distance of zoom (value must be smaller than or equal to 50.0). - shipGeneralCameraZoomMax = 20.0 - #Set minimum distance of zoom (value must be bigger than or equal to 1.0). - shipGeneralCameraZoomMin = 5.0 - -# This category holds configs that define general mod settings. -[General] - #Enable smallships creative tab in the creative inventory (only takes effect after restart). - smallshipsItemGroupEnable = false - diff --git a/config/smallships-common.toml b/config/smallships-common.toml deleted file mode 100644 index 5be303c46..000000000 --- a/config/smallships-common.toml +++ /dev/null @@ -1,88 +0,0 @@ -# This holds the schematic version for internal purposes. DO NOT TOUCH! -schematicVersion = 2 - -# This category holds configs that define ship behaviour. -[Ship] - - #This category holds configs that define general ship behaviour. - [Ship.General] - shipGeneralSailCooldown = 30 - shipGeneralCollisionDamage = 7.5 - shipGeneralDoItemDrop = true - - #General speed modifier for ships. - [Ship.General.Modifier] - #Maximum speed penalty for a filled container in percent. - shipGeneralContainerModifier = 10.0 - #Speed bonus for a paddle ship while paddling in percent. - shipGeneralPaddlingModifier = 35.0 - - #This category holds configs that define behaviour of fleeing water animals. - [Ship.General."Fleeing Water Animals"] - waterAnimalFleeRadius = 15.0 - waterAnimalFleeSpeed = 1.5 - waterAnimalFleeDistance = 10.0 - - [Ship.Cog] - - #Default attributes for the Cog. Speed in km/h, Health in default mc health points - [Ship.Cog.Attributes] - shipAttributeCogMaxHealth = 300.0 - shipAttributeCogMaxSpeed = 30.0 - shipAttributeCogMaxReverseSpeed = 0.1 - shipAttributeCogMaxRotationSpeed = 4.5 - shipAttributeCogAcceleration = 0.015 - shipAttributeCogRotationAcceleration = 0.7 - - #Default configs for the container of the Cog. - [Ship.Cog.Container] - #Set container size for the Cog (value must be divisible by 9 and bigger than 0). - shipContainerCogContainerSize = 108 - - #Cog specific speed modifier. - [Ship.Cog.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierCogBiome = 0 - - [Ship.Brigg] - - #Default attributes for the Brigg. Speed in km/h, Health in default mc health points - [Ship.Brigg.Attributes] - shipAttributeBriggMaxHealth = 450.0 - shipAttributeBriggMaxSpeed = 35.0 - shipAttributeBriggMaxReverseSpeed = 0.1 - shipAttributeBriggMaxRotationSpeed = 4.0 - shipAttributeBriggAcceleration = 0.015 - shipAttributeBriggRotationAcceleration = 0.55 - - #Default configs for the container of the Brigg. - [Ship.Brigg.Container] - #Set container size for the Brigg (value must be divisible by 9 and bigger than 0). - shipContainerBriggContainerSize = 162 - - #Brigg specific speed modifier. - [Ship.Brigg.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierBriggBiome = 0 - - [Ship.Galley] - - #Default attributes for the Galley. Speed in km/h, Health in default mc health points - [Ship.Galley.Attributes] - shipAttributeGalleyMaxHealth = 200.0 - shipAttributeGalleyMaxSpeed = 30.0 - shipAttributeGalleyMaxReverseSpeed = 0.1 - shipAttributeGalleyMaxRotationSpeed = 5.0 - shipAttributeGalleyAcceleration = 0.015 - shipAttributeGalleyRotationAcceleration = 1.0 - - #Default configs for the container of the Galley. - [Ship.Galley.Container] - #Set container size for the Galley (value must be divisible by 9 and bigger than 0). - shipContainerGalleyContainerSize = 54 - - #Galley specific speed modifier. - [Ship.Galley.Modifier] - #-1 = none, 0 = cold, 1 = neutral or 2 = warm Biomes - shipModifierGalleyBiome = 2 - From 51f8d9746c841e15044f4dfa518211caa5ac4f59 Mon Sep 17 00:00:00 2001 From: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com> Date: Fri, 5 Jan 2024 18:40:51 +0700 Subject: [PATCH 49/63] Update CHANGELOG.md Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com> --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8fdea06..9d5068f1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [0.4.1] - 05.01.2024 +### Изменения +- Исправлена кнопка подключения к официальному серверу. +- Исправлен рецепт молда для лопаты. + ## [0.4.0] - 05.01.2024 ### Изменения - Удалены из игры бронзовые паровые машины, тк позволяли скипнуть очень много прогресии TFC. From 85f3a6ce04479ce2b58f225bab8d974234fb9363 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:25:02 +0500 Subject: [PATCH 50/63] Update build.yml --- .github/workflows/build.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8cd10527e..ca354193a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,8 @@ jobs: project_version: ${{ steps.info.outputs.project_version }} mcversion: ${{ steps.info.outputs.mcversion }} tag: ${{ steps.version.outputs.tag }} - news: ${{ steps.changelog.outputs.news }} - changelog: ${{ steps.changelog_full.outputs.description }} + news: ${{ steps.message.outputs.news }} + changelog: ${{ steps.changelog.outputs.description }} steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -57,7 +57,7 @@ jobs: fi - name: Changelog Parser - id: changelog_full + id: changelog uses: coditory/changelog-parser@v1.0.2 with: path: CHANGELOG.md @@ -67,23 +67,26 @@ jobs: shell: bash run: | header="## **${{ steps.info.outputs.project_name }}** был обновлен до ${{ steps.info.outputs.project_version }}! :tada:" - echo -e "header=$header" >> $GITHUB_OUTPUT link+="[CurseForge]() • " link+="[GitHub]() • " link+="[Issues]()" - echo -e "link=$link" >> $GITHUB_OUTPUT - news=$(echo -e "${{ steps.changelog_full.outputs.description }}" | sed -n '/### Изменения/,/###/p' | sed '$d') - printf "%s\n" "news=$news" >> $GITHUB_OUTPUT + news="$header\n$link" + echo -e "$news" >> $GITHUB_OUTPUT + - name: Send Discord message - uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 + uses: tsickert/discord-webhook@v5.4.0 with: - key: "${{secrets.RELEASES_1_20}}" + webhook-url: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" - avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ steps.message.outputs.news }}" + avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" + embed-title: "${{ steps.message.outputs.news }}" + embed-description: "${{ steps.changelog.outputs.description }}" + embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 + content: "${{ steps.changelog.outputs.description }}" + embed-color: "#57F287" # build-cf-modpack: # name: Build CF Modpack From cba3b462d824efa0e48fcce5548b3a8b7fbc010d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:29:03 +0500 Subject: [PATCH 51/63] 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 ca354193a..abb921d4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,7 +72,7 @@ jobs: link+="[GitHub]() • " link+="[Issues]()" - news="$header\n$link" + news="$header \n $link" echo -e "$news" >> $GITHUB_OUTPUT From bf485e709ae96c3b5977883ccd15dc76dc6aba3f Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:31:21 +0500 Subject: [PATCH 52/63] Update build.yml --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index abb921d4f..526a140be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,14 +66,10 @@ jobs: id: message shell: bash run: | - header="## **${{ steps.info.outputs.project_name }}** был обновлен до ${{ steps.info.outputs.project_version }}! :tada:" - link+="[CurseForge]() • " link+="[GitHub]() • " link+="[Issues]()" - - news="$header \n $link" - echo -e "$news" >> $GITHUB_OUTPUT + echo -e "$link" >> $GITHUB_OUTPUT - name: Send Discord message @@ -82,7 +78,7 @@ jobs: webhook-url: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - embed-title: "${{ steps.message.outputs.news }}" + embed-title: "${{ steps.message.outputs.link }}" embed-description: "${{ steps.changelog.outputs.description }}" embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 content: "${{ steps.changelog.outputs.description }}" From 1ade28cd506d055067ad736e7569f035562eb04a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:32:19 +0500 Subject: [PATCH 53/63] Update build.yml --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 526a140be..8693ad858 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,10 +66,14 @@ jobs: id: message shell: bash run: | + header="## **${{ steps.info.outputs.project_name }}** был обновлен до ${{ steps.info.outputs.project_version }}! :tada:" + link+="[CurseForge]() • " link+="[GitHub]() • " link+="[Issues]()" - echo -e "$link" >> $GITHUB_OUTPUT + + news="$header\n$link" + echo "$news" >> $GITHUB_OUTPUT - name: Send Discord message @@ -78,7 +82,7 @@ jobs: webhook-url: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - embed-title: "${{ steps.message.outputs.link }}" + embed-title: "${{ steps.message.outputs.news }}" embed-description: "${{ steps.changelog.outputs.description }}" embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 content: "${{ steps.changelog.outputs.description }}" From 1897f9eeb07c5b639ea543abf4c4225cfa989ba1 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:34:09 +0500 Subject: [PATCH 54/63] 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 8693ad858..c3ba3adb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: link+="[Issues]()" news="$header\n$link" - echo "$news" >> $GITHUB_OUTPUT + echo "markdown=$news" >> $GITHUB_OUTPUT - name: Send Discord message @@ -82,7 +82,7 @@ jobs: webhook-url: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - embed-title: "${{ steps.message.outputs.news }}" + embed-title: "${{ steps.message.outputs.markdown }}" embed-description: "${{ steps.changelog.outputs.description }}" embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 content: "${{ steps.changelog.outputs.description }}" From 9729f91120956eef67fdcc0b39a00b2d3571b0af Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:36:20 +0500 Subject: [PATCH 55/63] Update build.yml --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3ba3adb3..bc1252f37 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,14 +66,11 @@ jobs: id: message shell: bash run: | - header="## **${{ steps.info.outputs.project_name }}** был обновлен до ${{ steps.info.outputs.project_version }}! :tada:" - link+="[CurseForge]() • " link+="[GitHub]() • " link+="[Issues]()" - news="$header\n$link" - echo "markdown=$news" >> $GITHUB_OUTPUT + echo "title=$link" >> $GITHUB_OUTPUT - name: Send Discord message @@ -82,10 +79,9 @@ jobs: webhook-url: "${{secrets.RELEASES_1_20}}" username: "TerraFirmaGreg" avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - embed-title: "${{ steps.message.outputs.markdown }}" + embed-title: "${{ steps.message.outputs.title }}" embed-description: "${{ steps.changelog.outputs.description }}" embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 - content: "${{ steps.changelog.outputs.description }}" embed-color: "#57F287" # build-cf-modpack: From 5b3432e7c1d43f330e5aafd95da65fdf7c46f292 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:40:46 +0500 Subject: [PATCH 56/63] 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 bc1252f37..f08c1c47c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,12 +76,11 @@ jobs: - name: Send Discord message uses: tsickert/discord-webhook@v5.4.0 with: - webhook-url: "${{secrets.RELEASES_1_20}}" + webhook-url: ${{secrets.RELEASES_1_20}} username: "TerraFirmaGreg" avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" embed-title: "${{ steps.message.outputs.title }}" embed-description: "${{ steps.changelog.outputs.description }}" - embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 embed-color: "#57F287" # build-cf-modpack: From 0e7c53af904fbc3fa12abe66e26a0b1790e6ff5a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:44:18 +0500 Subject: [PATCH 57/63] Update build.yml --- .github/workflows/build.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f08c1c47c..11aad636b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,27 +61,17 @@ jobs: uses: coditory/changelog-parser@v1.0.2 with: path: CHANGELOG.md - - - name: Create Discord message - id: message - shell: bash - run: | - link+="[CurseForge]() • " - link+="[GitHub]() • " - link+="[Issues]()" - - echo "title=$link" >> $GITHUB_OUTPUT - - + - 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/logo_new_year.png" - embed-title: "${{ steps.message.outputs.title }}" + embed-title: Release ${{ steps.changelog.outputs.version }} + embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 embed-description: "${{ steps.changelog.outputs.description }}" - embed-color: "#57F287" + embed-color: 5814783 # build-cf-modpack: # name: Build CF Modpack From 65fecd0ff3a902b332821d2396147d6ea54773a1 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:46:13 +0500 Subject: [PATCH 58/63] Update CHANGELOG.md --- CHANGELOG.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d5068f1e..5d8fdea06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,5 @@ # Changelog -## [0.4.1] - 05.01.2024 -### Изменения -- Исправлена кнопка подключения к официальному серверу. -- Исправлен рецепт молда для лопаты. - ## [0.4.0] - 05.01.2024 ### Изменения - Удалены из игры бронзовые паровые машины, тк позволяли скипнуть очень много прогресии TFC. From c6f767aaf7642cc3e144145888c3eceba3f7778d Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:48:07 +0500 Subject: [PATCH 59/63] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 90375de0e..2d98c6e91 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 90375de0e18dda6ede598136b9307ebd4f592962 +Subproject commit 2d98c6e914ab46aac398b02bbd56f495ec0db5f8 From 4611d42fcaac4b5a9137f9bc31b12e0e12fcfda8 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:48:45 +0500 Subject: [PATCH 60/63] manifest --- .github/buildtools/modpack/manifest.json | 936 +++++++++++------------ .github/buildtools/modpack/modlist.html | 192 ++--- 2 files changed, 564 insertions(+), 564 deletions(-) diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json index feb733ec5..65c6f23bc 100644 --- a/.github/buildtools/modpack/manifest.json +++ b/.github/buildtools/modpack/manifest.json @@ -15,489 +15,29 @@ "author": "Exception, Xikaro", "projectID": 385053, "files": [ - { - "projectID": 916493, - "fileID": 4988266, - "required": true - }, - { - "projectID": 663477, - "fileID": 4826822, - "required": true - }, - { - "projectID": 513402, - "fileID": 5007529, - "required": true - }, - { - "projectID": 255389, - "fileID": 4798205, - "required": true - }, - { - "projectID": 511770, - "fileID": 4606615, - "required": true - }, - { - "projectID": 309927, - "fileID": 4985525, - "required": true - }, - { - "projectID": 439890, - "fileID": 4929694, - "required": true - }, - { - "projectID": 238086, - "fileID": 4948967, - "required": true - }, - { - "projectID": 232131, - "fileID": 4635878, - "required": true - }, - { - "projectID": 823106, - "fileID": 4906217, - "required": true - }, - { - "projectID": 890405, - "fileID": 5000343, - "required": true - }, - { - "projectID": 570630, - "fileID": 4936333, - "required": true - }, - { - "projectID": 714158, - "fileID": 4987747, - "required": true - }, - { - "projectID": 317780, - "fileID": 4929640, - "required": true - }, - { - "projectID": 633412, - "fileID": 4685319, - "required": true - }, - { - "projectID": 618298, - "fileID": 4993651, - "required": true - }, - { - "projectID": 583345, - "fileID": 4925840, - "required": true - }, - { - "projectID": 231095, - "fileID": 4787442, - "required": true - }, - { - "projectID": 60089, - "fileID": 4581240, - "required": true - }, - { - "projectID": 581495, - "fileID": 4952626, - "required": true - }, - { - "projectID": 240633, - "fileID": 4655091, - "required": true - }, - { - "projectID": 435044, - "fileID": 4596768, - "required": true - }, - { - "projectID": 266890, - "fileID": 4994127, - "required": true - }, - { - "projectID": 263420, - "fileID": 4933782, - "required": true - }, - { - "projectID": 422301, - "fileID": 4993659, - "required": true - }, - { - "projectID": 308240, - "fileID": 4820041, - "required": true - }, { "projectID": 636608, "fileID": 4982660, "required": true }, - { - "projectID": 453394, - "fileID": 4976486, - "required": true - }, - { - "projectID": 251407, - "fileID": 4751740, - "required": true - }, - { - "projectID": 665658, - "fileID": 4982356, - "required": true - }, - { - "projectID": 310111, - "fileID": 4951142, - "required": true - }, - { - "projectID": 841001, - "fileID": 4945181, - "required": true - }, - { - "projectID": 223794, - "fileID": 4997114, - "required": true - }, - { - "projectID": 908741, - "fileID": 4984832, - "required": true - }, - { - "projectID": 272335, - "fileID": 4990314, - "required": true - }, - { - "projectID": 254284, - "fileID": 4887789, - "required": true - }, - { - "projectID": 387638, - "fileID": 4691333, - "required": true - }, - { - "projectID": 237307, - "fileID": 4600191, - "required": true - }, - { - "projectID": 288885, - "fileID": 4711423, - "required": true - }, - { - "projectID": 410295, - "fileID": 4583492, - "required": true - }, - { - "projectID": 404465, - "fileID": 4864329, - "required": true - }, - { - "projectID": 889915, - "fileID": 4932157, - "required": true - }, - { - "projectID": 256717, - "fileID": 4614555, - "required": true - }, - { - "projectID": 411045, - "fileID": 4578649, - "required": true - }, - { - "projectID": 333287, - "fileID": 4833106, - "required": true - }, - { - "projectID": 328085, - "fileID": 4835191, - "required": true - }, - { - "projectID": 448233, - "fileID": 4763645, - "required": true - }, - { - "projectID": 257814, - "fileID": 5005088, - "required": true - }, - { - "projectID": 495693, - "fileID": 4870168, - "required": true - }, - { - "projectID": 282001, - "fileID": 5005529, - "required": true - }, - { - "projectID": 927874, - "fileID": 4968758, - "required": true - }, - { - "projectID": 880532, - "fileID": 4895948, - "required": true - }, - { - "projectID": 316582, - "fileID": 4973430, - "required": true - }, - { - "projectID": 662156, - "fileID": 4944918, - "required": true - }, - { - "projectID": 270441, - "fileID": 4578892, - "required": true - }, - { - "projectID": 419699, - "fileID": 4663010, - "required": true - }, - { - "projectID": 688231, - "fileID": 4836196, - "required": true - }, - { - "projectID": 429235, - "fileID": 4810975, - "required": true - }, - { - "projectID": 297038, - "fileID": 4969628, - "required": true - }, - { - "projectID": 260262, - "fileID": 4581167, - "required": true - }, - { - "projectID": 306770, - "fileID": 4966125, - "required": true - }, - { - "projectID": 302973, - "fileID": 4976574, - "required": true - }, - { - "projectID": 844019, - "fileID": 4893142, - "required": true - }, - { - "projectID": 289412, - "fileID": 4929479, - "required": true - }, - { - "projectID": 357540, - "fileID": 4699629, - "required": true - }, - { - "projectID": 365281, - "fileID": 4612683, - "required": true - }, - { - "projectID": 433760, - "fileID": 4573913, - "required": true - }, - { - "projectID": 312664, - "fileID": 4745380, - "required": true - }, - { - "projectID": 348521, - "fileID": 4973441, - "required": true - }, - { - "projectID": 475117, - "fileID": 4711435, - "required": true - }, - { - "projectID": 538149, - "fileID": 4620037, - "required": true - }, - { - "projectID": 790626, - "fileID": 4980929, - "required": true - }, - { - "projectID": 429371, - "fileID": 4884096, - "required": true - }, - { - "projectID": 404468, - "fileID": 4623116, - "required": true - }, - { - "projectID": 818089, - "fileID": 4872397, - "required": true - }, - { - "projectID": 940350, - "fileID": 4922586, - "required": true - }, - { - "projectID": 526854, - "fileID": 4631193, - "required": true - }, - { - "projectID": 674852, - "fileID": 4828026, - "required": true - }, - { - "projectID": 912469, - "fileID": 4956177, - "required": true - }, - { - "projectID": 283644, - "fileID": 4913663, - "required": true - }, - { - "projectID": 326652, - "fileID": 4979375, - "required": true - }, - { - "projectID": 922713, - "fileID": 4982165, - "required": true - }, - { - "projectID": 410811, - "fileID": 4896152, - "required": true - }, - { - "projectID": 314905, - "fileID": 4596742, - "required": true - }, - { - "projectID": 367706, - "fileID": 4776833, - "required": true - }, - { - "projectID": 531761, - "fileID": 4943500, - "required": true - }, - { - "projectID": 401648, - "fileID": 4863626, - "required": true - }, - { - "projectID": 299540, - "fileID": 4711441, - "required": true - }, - { - "projectID": 551736, - "fileID": 4731947, - "required": true - }, - { - "projectID": 871755, - "fileID": 4999501, - "required": true - }, { "projectID": 495476, "fileID": 4924184, "required": true }, { - "projectID": 416294, - "fileID": 4944325, + "projectID": 223794, + "fileID": 4997114, "required": true }, { - "projectID": 521393, - "fileID": 4837449, + "projectID": 410811, + "fileID": 4896152, "required": true }, { - "projectID": 551894, - "fileID": 4688940, - "required": true - }, - { - "projectID": 634062, - "fileID": 4610474, - "required": true - }, - { - "projectID": 233019, - "fileID": 4578262, - "required": true - }, - { - "projectID": 459929, - "fileID": 4936437, + "projectID": 237307, + "fileID": 4600191, "required": true }, { @@ -506,8 +46,23 @@ "required": true }, { - "projectID": 354353, - "fileID": 4891706, + "projectID": 429371, + "fileID": 4884096, + "required": true + }, + { + "projectID": 908741, + "fileID": 4984832, + "required": true + }, + { + "projectID": 663477, + "fileID": 4826822, + "required": true + }, + { + "projectID": 283644, + "fileID": 4913663, "required": true }, { @@ -515,20 +70,465 @@ "fileID": 4613538, "required": true }, + { + "projectID": 890405, + "fileID": 5000343, + "required": true + }, + { + "projectID": 404468, + "fileID": 4623116, + "required": true + }, + { + "projectID": 309927, + "fileID": 4985525, + "required": true + }, + { + "projectID": 511770, + "fileID": 4606615, + "required": true + }, + { + "projectID": 844019, + "fileID": 4893142, + "required": true + }, + { + "projectID": 688231, + "fileID": 4836196, + "required": true + }, + { + "projectID": 581495, + "fileID": 4952626, + "required": true + }, + { + "projectID": 263420, + "fileID": 4933782, + "required": true + }, + { + "projectID": 453394, + "fileID": 4976486, + "required": true + }, + { + "projectID": 310111, + "fileID": 4951142, + "required": true + }, + { + "projectID": 927874, + "fileID": 4968758, + "required": true + }, + { + "projectID": 912469, + "fileID": 4956177, + "required": true + }, + { + "projectID": 302973, + "fileID": 4976574, + "required": true + }, + { + "projectID": 634062, + "fileID": 4610474, + "required": true + }, + { + "projectID": 255389, + "fileID": 4798205, + "required": true + }, + { + "projectID": 551894, + "fileID": 4688940, + "required": true + }, + { + "projectID": 570630, + "fileID": 4936333, + "required": true + }, + { + "projectID": 233019, + "fileID": 4578262, + "required": true + }, + { + "projectID": 411045, + "fileID": 4578649, + "required": true + }, + { + "projectID": 662156, + "fileID": 4944918, + "required": true + }, + { + "projectID": 306770, + "fileID": 4966125, + "required": true + }, + { + "projectID": 818089, + "fileID": 4872397, + "required": true + }, + { + "projectID": 231095, + "fileID": 4787442, + "required": true + }, + { + "projectID": 448233, + "fileID": 4763645, + "required": true + }, { "projectID": 654373, "fileID": 4873766, "required": true }, + { + "projectID": 922713, + "fileID": 4982165, + "required": true + }, + { + "projectID": 551736, + "fileID": 4731947, + "required": true + }, + { + "projectID": 314905, + "fileID": 4596742, + "required": true + }, + { + "projectID": 60089, + "fileID": 4581240, + "required": true + }, + { + "projectID": 326652, + "fileID": 4979375, + "required": true + }, + { + "projectID": 266890, + "fileID": 4994127, + "required": true + }, + { + "projectID": 251407, + "fileID": 4751740, + "required": true + }, + { + "projectID": 439890, + "fileID": 4929694, + "required": true + }, + { + "projectID": 435044, + "fileID": 4596768, + "required": true + }, + { + "projectID": 254284, + "fileID": 4887789, + "required": true + }, + { + "projectID": 410295, + "fileID": 4583492, + "required": true + }, + { + "projectID": 312664, + "fileID": 4745380, + "required": true + }, + { + "projectID": 288885, + "fileID": 4711423, + "required": true + }, + { + "projectID": 387638, + "fileID": 4691333, + "required": true + }, + { + "projectID": 495693, + "fileID": 4870168, + "required": true + }, + { + "projectID": 404465, + "fileID": 4864329, + "required": true + }, + { + "projectID": 272335, + "fileID": 4990314, + "required": true + }, + { + "projectID": 316582, + "fileID": 4973430, + "required": true + }, + { + "projectID": 282001, + "fileID": 5005529, + "required": true + }, + { + "projectID": 238086, + "fileID": 4948967, + "required": true + }, + { + "projectID": 308240, + "fileID": 4820041, + "required": true + }, + { + "projectID": 419699, + "fileID": 4663010, + "required": true + }, + { + "projectID": 433760, + "fileID": 5008760, + "required": true + }, { "projectID": 292038, "fileID": 4594106, "required": true }, + { + "projectID": 674852, + "fileID": 4828026, + "required": true + }, { "projectID": 324717, "fileID": 4986594, "required": true + }, + { + "projectID": 401648, + "fileID": 4863626, + "required": true + }, + { + "projectID": 871755, + "fileID": 4999501, + "required": true + }, + { + "projectID": 880532, + "fileID": 4895948, + "required": true + }, + { + "projectID": 299540, + "fileID": 4711441, + "required": true + }, + { + "projectID": 940350, + "fileID": 4922586, + "required": true + }, + { + "projectID": 365281, + "fileID": 4612683, + "required": true + }, + { + "projectID": 841001, + "fileID": 4945181, + "required": true + }, + { + "projectID": 270441, + "fileID": 4578892, + "required": true + }, + { + "projectID": 422301, + "fileID": 4993659, + "required": true + }, + { + "projectID": 531761, + "fileID": 4943500, + "required": true + }, + { + "projectID": 889915, + "fileID": 4932157, + "required": true + }, + { + "projectID": 475117, + "fileID": 4711435, + "required": true + }, + { + "projectID": 790626, + "fileID": 4980929, + "required": true + }, + { + "projectID": 583345, + "fileID": 4925840, + "required": true + }, + { + "projectID": 232131, + "fileID": 4635878, + "required": true + }, + { + "projectID": 618298, + "fileID": 4993651, + "required": true + }, + { + "projectID": 916493, + "fileID": 4988266, + "required": true + }, + { + "projectID": 367706, + "fileID": 4776833, + "required": true + }, + { + "projectID": 348521, + "fileID": 4973441, + "required": true + }, + { + "projectID": 416294, + "fileID": 4944325, + "required": true + }, + { + "projectID": 260262, + "fileID": 4581167, + "required": true + }, + { + "projectID": 289412, + "fileID": 4929479, + "required": true + }, + { + "projectID": 521393, + "fileID": 4837449, + "required": true + }, + { + "projectID": 240633, + "fileID": 4655091, + "required": true + }, + { + "projectID": 328085, + "fileID": 4835191, + "required": true + }, + { + "projectID": 357540, + "fileID": 4699629, + "required": true + }, + { + "projectID": 354353, + "fileID": 4891706, + "required": true + }, + { + "projectID": 526854, + "fileID": 4631193, + "required": true + }, + { + "projectID": 317780, + "fileID": 4929640, + "required": true + }, + { + "projectID": 823106, + "fileID": 4906217, + "required": true + }, + { + "projectID": 256717, + "fileID": 4614555, + "required": true + }, + { + "projectID": 538149, + "fileID": 4620037, + "required": true + }, + { + "projectID": 714158, + "fileID": 4987747, + "required": true + }, + { + "projectID": 429235, + "fileID": 4810975, + "required": true + }, + { + "projectID": 665658, + "fileID": 4982356, + "required": true + }, + { + "projectID": 297038, + "fileID": 4969628, + "required": true + }, + { + "projectID": 257814, + "fileID": 5005088, + "required": true + }, + { + "projectID": 633412, + "fileID": 4685319, + "required": true + }, + { + "projectID": 459929, + "fileID": 4936437, + "required": true + }, + { + "projectID": 513402, + "fileID": 5009676, + "required": true + }, + { + "projectID": 333287, + "fileID": 4833106, + "required": true } ], "overrides": "overrides" diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html index 96960e8c5..96ad7cd01 100644 --- a/.github/buildtools/modpack/modlist.html +++ b/.github/buildtools/modpack/modlist.html @@ -1,105 +1,105 @@  From 988330881a9d6bde62fc109544bfb91b8a6d9e29 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 17:52:07 +0500 Subject: [PATCH 61/63] workflows final --- .github/workflows/build.yml | 233 ++++++++++++++++------------------ .github/workflows/release.yml | 23 +--- CHANGELOG.md | 8 ++ 3 files changed, 126 insertions(+), 138 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11aad636b..f1d0b98bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,6 @@ jobs: project_version: ${{ steps.info.outputs.project_version }} mcversion: ${{ steps.info.outputs.mcversion }} tag: ${{ steps.version.outputs.tag }} - news: ${{ steps.message.outputs.news }} changelog: ${{ steps.changelog.outputs.description }} steps: - name: Checkout @@ -61,138 +60,128 @@ jobs: uses: coditory/changelog-parser@v1.0.2 with: path: CHANGELOG.md - - - name: Send Discord message - uses: tsickert/discord-webhook@v5.4.0 + + + build-cf-modpack: + name: Build CF Modpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/manifest.json + sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/main_menu.txt + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + + - name: Export CF + run: | + mkdir -p overrides + mv -vf {config,defaultconfigs,kubejs} overrides/ + mv -vf .github/buildtools/modpack/manifest.json ./ + mv -vf .github/buildtools/modpack/modlist.html ./ + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides + + - name: Upload zip cf + uses: actions/upload-artifact@v4.0.0 with: - webhook-url: ${{secrets.RELEASES_1_20}} - username: "TerraFirmaGreg" - avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - embed-title: Release ${{ steps.changelog.outputs.version }} - embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.0 - embed-description: "${{ steps.changelog.outputs.description }}" - embed-color: 5814783 + name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip + retention-days: 5 - # build-cf-modpack: - # name: Build CF Modpack - # runs-on: ubuntu-latest - # needs: [modpack-info] - # steps: - # - name: Checkout - # uses: actions/checkout@v4.1.1 + build-mmc-modpack: + name: Build MMC Modpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 - # - name: Replace strings - # shell: bash - # run: | - # VERSION=${{ needs.modpack-info.outputs.project_version }} - # sed -i -e "s/DEV/${VERSION}/g" .github/buildtools/modpack/manifest.json - # sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/main_menu.txt - # sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + 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 - # - name: Export CF - # run: | - # mkdir -p overrides - # mv -vf {config,defaultconfigs,kubejs} overrides/ - # mv -vf .github/buildtools/modpack/manifest.json ./ - # mv -vf .github/buildtools/modpack/modlist.html ./ - # zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip manifest.json modlist.html overrides + - name: Download Mods + run: | + git submodule init + cd mods + git config --global credential.helper '!f() { + echo "username=Xikaro"; + echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' + git submodule update --recursive - # - name: Upload zip cf - # uses: actions/upload-artifact@v4.0.0 - # with: - # name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf - # path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip - # retention-days: 5 - - # build-mmc-modpack: - # name: Build MMC Modpack - # runs-on: ubuntu-latest - # needs: [modpack-info] - # steps: - # - name: Checkout - # uses: actions/checkout@v4.1.1 - - # - name: Replace strings - # shell: bash - # run: | - # VERSION=${{ needs.modpack-info.outputs.project_version }} - # 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 - - # - name: Download Mods - # run: | - # git submodule init - # cd mods - # git config --global credential.helper '!f() { - # echo "username=Xikaro"; - # echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' - # git submodule update --recursive - - # - name: Export MMC - # run: | - # mkdir -p .minecraft - # mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/ - # mv -vf .github/buildtools/modpack/mmc-pack.json ./ - # mv -vf .github/buildtools/modpack/instance.cfg ./ - # zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ + - name: Export MMC + run: | + mkdir -p .minecraft + mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/ + mv -vf .github/buildtools/modpack/mmc-pack.json ./ + mv -vf .github/buildtools/modpack/instance.cfg ./ + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip mmc-pack.json instance.cfg .minecraft/ - # - name: Upload zip mmc - # uses: actions/upload-artifact@v4.0.0 - # with: - # name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc - # path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip - # retention-days: 5 + - name: Upload zip mmc + uses: actions/upload-artifact@v4.0.0 + with: + name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip + retention-days: 5 - # build-serverpack: - # name: Build Serverpack - # runs-on: ubuntu-latest - # needs: [modpack-info] - # steps: - # - name: Checkout - # uses: actions/checkout@v4.1.1 + build-serverpack: + name: Build Serverpack + runs-on: ubuntu-latest + needs: [modpack-info] + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 - # - name: Replace strings - # shell: bash - # run: | - # VERSION=${{ needs.modpack-info.outputs.project_version }} - # sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml + - name: Replace strings + shell: bash + run: | + VERSION=${{ needs.modpack-info.outputs.project_version }} + sed -i -e "s/DEV/${VERSION}/g" config/bcc-common.toml - # - name: Download Mods - # run: | - # git submodule init - # cd mods - # git config --global credential.helper '!f() { - # echo "username=Xikaro"; - # echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' - # git submodule update --recursive + - name: Download Mods + run: | + git submodule init + cd mods + git config --global credential.helper '!f() { + echo "username=Xikaro"; + echo "password=${{ secrets.USER_TOKEN_XIKARO }}"; }; f' + git submodule update --recursive - # - name: Export serverpack - # run: | - # mkdir -p .minecraft - # mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft - # cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done - # zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip .minecraft/* + - name: Export serverpack + run: | + mkdir -p .minecraft + mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft + cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done + zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip .minecraft/* - # - name: Upload zip - # uses: actions/upload-artifact@v4.0.0 - # with: - # name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server - # path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip - # retention-days: 5 + - name: Upload zip + uses: actions/upload-artifact@v4.0.0 + with: + name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server + path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip + retention-days: 5 - # release: - # name: Release - # needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] - # if: startsWith(github.ref, 'refs/tags/') - # uses: ./.github/workflows/release.yml - # with: - # project_name: ${{ needs.modpack-info.outputs.project_name }} - # project_version: ${{ needs.modpack-info.outputs.project_version }} - # mcversion: ${{ needs.modpack-info.outputs.mcversion }} - # tag: ${{ needs.modpack-info.outputs.tag }} - # news: ${{ needs.modpack-info.outputs.news }} - # changelog: ${{ needs.modpack-info.outputs.changelog }} - # secrets: inherit + release: + name: Release + needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack] + if: startsWith(github.ref, 'refs/tags/') + uses: ./.github/workflows/release.yml + with: + project_name: ${{ needs.modpack-info.outputs.project_name }} + project_version: ${{ needs.modpack-info.outputs.project_version }} + mcversion: ${{ needs.modpack-info.outputs.mcversion }} + tag: ${{ needs.modpack-info.outputs.tag }} + news: ${{ needs.modpack-info.outputs.news }} + changelog: ${{ needs.modpack-info.outputs.changelog }} + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0abc11ccf..1f2439585 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,25 +65,16 @@ jobs: server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server release-type: ${{ env.RELEASE_TYPE }} - - name: Create Discord message - id: message - shell: bash - run: | - header="## **${{ inputs.project_name }}** был обновлен до ${{ inputs.project_version }}! :tada:" - echo "header=$header" >> $GITHUB_OUTPUT - - link+="[CurseForge]() • " - link+="[GitHub]() • " - link+="[Issues]()" - echo "link=$link" >> $GITHUB_OUTPUT - - name: Send Discord message - uses: hugoalh/send-discord-webhook-ghaction@v6.0.1 + uses: tsickert/discord-webhook@v5.4.0 with: - key: "${{secrets.RELEASES_1_20}}" + webhook-url: ${{secrets.RELEASES_1_20}} username: "TerraFirmaGreg" - avatar_url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" - content: "${{ steps.message.outputs.header }}\n${{ steps.message.outputs.link }}\n${{ inputs.news }}" + avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png" + embed-title: Release ${{ inputs.project_version }} + embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ inputs.tag }} + embed-description: ${{ inputs.changelog }} + embed-color: 5814783 release-github: name: Deploy to GitHub diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d8fdea06..b1f042741 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## [0.4.1] - 05.01.2024 +### Изменения +- Исправлена кнопка подключения к официальному серверу. +- Исправлен рецепт молда для лопаты. +### Обновленные моды +- TerraFirmaGreg-Core -> 0.2.5 +- notenoughanimations -> 1.7.0 + ## [0.4.0] - 05.01.2024 ### Изменения - Удалены из игры бронзовые паровые машины, тк позволяли скипнуть очень много прогресии TFC. From 43067801233800003171dac98ff6b4229ab32243 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 5 Jan 2024 20:47:18 +0700 Subject: [PATCH 62/63] conf --- config/embeddium++.toml | 80 ++++++++++++++++++++++++++++++++ config/sodium-extra-options.json | 12 ++--- 2 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 config/embeddium++.toml diff --git a/config/embeddium++.toml b/config/embeddium++.toml new file mode 100644 index 000000000..ea1c2eb27 --- /dev/null +++ b/config/embeddium++.toml @@ -0,0 +1,80 @@ + +[EmbeddiumPlus] + + [EmbeddiumPlus.DynamicLights] + OnlyUpdateOnPositionChange = true + DynamicEntityLighting = true + #Allowed Values: OFF, SLOW, FAST, FASTEST, REALTIME + QualityMode = "REALTIME" + DynamicTileEntityLighting = true + + #You can configure FPS overlay at the corner + [EmbeddiumPlus.fps_overlay] + #Allowed Values: OFF, SIMPLE, ADVANCED + DisplayMode = "ADVANCED" + OverlayMargin = 12 + + #Configure max BlockEntity distance + [EmbeddiumPlus.block_entity_distance] + #Max horizontal render distance + #Value is squared, default was 64^2 (or 64x64) + maxHorizontalDistance = 4096 + #Max vertical render distance + #Value is raw + maxVerticalDistance = 32 + + [EmbeddiumPlus.Misc] + RenderFog = true + HideJEI = false + CloudHeight = 128 + #Allowed Values: OFF, FAST, FANCY + ChunkFadeInQuality = "FANCY" + #Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN + BorderlessFullscreen = "FULLSCREEN" + ExtendedServerViewDistance = true + + #Configure max Entity distance + [EmbeddiumPlus.entity_distance_limit] + #Max horizontal render distance + #Value is squared, default was 64^2 (or 64x64) + maxHorizontalDistance = 4096 + #Turn on this feature + Enable = true + #List of entities to not be ignored when are out of configured radius. + #Accepts ResourceLocation and Mod IDs + #Example: "minecraft:bat" for specific entity or "alexmobs:*" for all mod specific entities + entityWhitelist = [] + #Max vertical render distance + #Value is raw + maxVerticalDistance = 32 + + #Configure TrueDarkness feature + #Section deprecated and removed soon (in favor of rework) + [EmbeddiumPlus.true_darkness] + #Sets darkness mode + #Depending of the option darkness can be less or more aggressive + #Allowed Values: PITCH_BLACK, REALLY_DARK, DARK, DIM + DarknessMode = "REALLY_DARK" + #Turn on this feature + Enable = true + + [EmbeddiumPlus.true_darkness.Advanced] + IgnoreMoonPhase = false + BlockLightingOnly = false + #Range: 0.0 ~ 1.0 + MaximumMoonBrightness = 0.25 + #Range: 0.0 ~ 1.0 + MinimumMoonBrightness = 0.0 + + #Configure what dimension should use TrueDarkness + [EmbeddiumPlus.true_darkness.DimensionSettings] + DefaultSetting = false + #Range: 0.0 ~ 1.0 + DarkNetherFogBrightness = 0.5 + DarkWhenNoSkylight = false + Nether = false + Overworld = true + #Range: 0.0 ~ 1.0 + DarkEndFogBrightness = 0.0 + "Dark End?" = false + diff --git a/config/sodium-extra-options.json b/config/sodium-extra-options.json index dedf2dcee..b6934868f 100644 --- a/config/sodium-extra-options.json +++ b/config/sodium-extra-options.json @@ -49,15 +49,15 @@ "use_adaptive_sync": false, "cloud_height": 192, "cloud_distance": 100, - "toasts": true, - "advancement_toast": true, - "recipe_toast": true, - "system_toast": true, - "tutorial_toast": true, + "toasts": false, + "advancement_toast": false, + "recipe_toast": false, + "system_toast": false, + "tutorial_toast": false, "instant_sneak": false, "prevent_shaders": false, "steady_debug_hud": true, - "steady_debug_hud_refresh_interval": 1 + "steady_debug_hud_refresh_interval": 10 }, "super_secret_settings": { "fetch_sodium_extra_crowdin_translations": false, From 85bf619535c9c72664f4076c0ef185f7b012391a Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Fri, 5 Jan 2024 18:48:55 +0500 Subject: [PATCH 63/63] Update mods --- mods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods b/mods index 2d98c6e91..9584cf55a 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 2d98c6e914ab46aac398b02bbd56f495ec0db5f8 +Subproject commit 9584cf55a8871c54b9cff14a8fde0fd11a817ac1