Merge branch 'master' into nightly-version-string-through-ci

GTNewHorizons · Nov 20, 2024 · c1cebdf · c1cebdf
2 parents 2aafa89 + fda893e
commit c1cebdf
Show file tree

Hide file tree

Showing 28 changed files with 7,996 additions and 3,335 deletions.
diff --git a/.github/workflows/nightly-modpack-build.yml b/.github/workflows/nightly-modpack-build.yml
@@ -82,6 +82,21 @@ jobs:
           path: cache
           key: daxxl-${{ runner.os }}-${{ steps.date.outputs.cachedate }}
 
+      - name: Retrieve last non-nightly release name
+        shell: bash
+        if: success() || failure()
+        run: |
+          last_non_nightly_release_name="$(jq -r '.releases | map(select(contains("nightly") | not)) | last' <./gtnh-modpack.json)"
+          echo "nightly_non_nightly_changelog_file=./releases/changelogs/changelog from ${last_non_nightly_release_name} to nightly.md" >> $GITHUB_ENV
+          echo "last_non_nightly_release_name=${last_non_nightly_release_name}" >> $GITHUB_ENV
+
+      - name: Generate changelog between nightly and last non-nightly release
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.NIGHTLY_GITHUB_TOKEN }}
+        run: |
+          poetry run python -m gtnh.cli.generate_changelog --previous-release-name "$last_non_nightly_release_name" nightly > "$nightly_non_nightly_changelog_file"
+
       # Upload modpack
 
       - name: Upload manifest
@@ -172,6 +187,7 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config pull.rebase true
+          git add "$nightly_non_nightly_changelog_file"
           git add "./releases/changelogs/nightly builds"
           git add ./releases/manifests/nightly.json
           git add ./gtnh-assets.json

diff --git a/gtnh-assets.json b/gtnh-assets.json
diff --git a/gtnh-modpack.json b/gtnh-modpack.json
@@ -9,6 +9,7 @@
     "2.7.0-beta-1",
     "2.7.0-beta-2",
     "2.7.0-beta-3",
+    "2.7.0-beta-4",
     "nightly",
     "previous_nightly"
   ],

diff --git a/releases/changelogs/changelog from 2.5.1 to nightly.md b/releases/changelogs/changelog from 2.5.1 to nightly.md
diff --git a/releases/changelogs/changelog from 2.6.1 to 2.7.0-beta-4.md b/releases/changelogs/changelog from 2.6.1 to 2.7.0-beta-4.md
diff --git a/releases/changelogs/changelog from 2.7.0-beta-3 to 2.7.0-beta-4.md b/releases/changelogs/changelog from 2.7.0-beta-3 to 2.7.0-beta-4.md
diff --git a/releases/changelogs/changelog from 2.7.0-beta-3 to nightly.md b/releases/changelogs/changelog from 2.7.0-beta-3 to nightly.md
diff --git a/releases/changelogs/changelog from 2.7.0-beta-4 to nightly.md b/releases/changelogs/changelog from 2.7.0-beta-4 to nightly.md
@@ -0,0 +1,9 @@
+# Updated - StructureLib - 1.3.5 --> 1.3.6
+## *1.3.6*
+>## What's Changed
+>* Send correct identifier when instrumenting by @Lyfts in https://github.com/GTNewHorizons/StructureLib/pull/34
+>
+>
+>**Full Changelog**: https://github.com/GTNewHorizons/StructureLib/compare/1.3.5...1.3.6
+>
+
diff --git a/releases/changelogs/nightly builds/changelog from nightly 726 to 727.md b/releases/changelogs/nightly builds/changelog from nightly 726 to 727.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 727 to 728.md b/releases/changelogs/nightly builds/changelog from nightly 727 to 728.md
@@ -0,0 +1,30 @@
+# Updated FloodLights (1.4.1@BOTH --> 1.4.2@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/FloodLights/compare/1.4.1...1.4.2
+>## What's Changed
+> * sanity te check & update bs+deps by @Pilzinsel64 in https://github.com/GTNewHorizons/FloodLights/pull/5 (1.4.2)
+>
+
+# Updated GT5-Unofficial (5.09.50.62@BOTH --> 5.09.50.64@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/GT5-Unofficial/compare/5.09.50.62...5.09.50.64
+>## What's Changed
+> * Fix Solidifier Autoplace and Add Glass Subchannel by @Ruling-0 in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3480 (5.09.50.64)
+> * Small solidifier structure check fix by @FourIsTheNumber in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3479 (5.09.50.64)
+> * Add tool batch mode for some multis by @StaffiX in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3475 (5.09.50.64)
+> * Remove OC AVR architecture by @serenibyss in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3474 (5.09.50.63)
+> * Adjust number formatting in WAILA machine progress line by @wlhlm in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3478 (5.09.50.63)
+>
+
+# Updated GTNHLib (0.5.19@BOTH --> 0.5.20@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/GTNHLib/compare/0.5.19...0.5.20
+>## What's Changed
+> * Disable thread safety checks with FalseTweaks by @ah-OOG-ah in https://github.com/GTNewHorizons/GTNHLib/pull/88 (0.5.20)
+>
+
+# Updated WitchingGadgets (1.5.15-GTNH@BOTH --> 1.5.16-GTNH@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/WitchingGadgets/compare/1.5.15-GTNH...1.5.16-GTNH
+>## What's Changed
+> * Blacklist Thaumcraft clusters + made the file more readable by @Ethryan in https://github.com/GTNewHorizons/WitchingGadgets/pull/63 (1.5.16-GTNH)
+>
+
+# Credits
+A special thanks to @Pilzinsel64, who contributed to this release!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 728 to 729.md b/releases/changelogs/nightly builds/changelog from nightly 728 to 729.md
@@ -0,0 +1,30 @@
+# Updated Crops-plus-plus (1.7.9@BOTH --> 1.7.10@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/Crops-plus-plus/compare/1.7.9...1.7.10
+>## What's Changed
+> * Make Spade behave more like a vanilla Hoe by @wlhlm in https://github.com/GTNewHorizons/Crops-plus-plus/pull/82 (1.7.10)
+>
+
+# Updated EnderIO (2.8.20@BOTH --> 2.8.21@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/EnderIO/compare/2.8.20...2.8.21
+>## What's Changed
+> * removed conduit subtype by @Nockyx in https://github.com/GTNewHorizons/EnderIO/pull/179 (2.8.21)
+>
+
+# Updated GT5-Unofficial (5.09.50.64@BOTH --> 5.09.50.66@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/GT5-Unofficial/compare/5.09.50.64...5.09.50.66
+>## What's Changed
+> * Delete NBT data about crafting components on MetaTileEntity by @Alexdoru in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3476 (5.09.50.66)
+> * Save custom name on particular case by @RealSilverMoon in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3473 (5.09.50.66)
+> * Improve EoH tier numbering in portable scanner info by @Kogepan229 in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3483 (5.09.50.66)
+> * remove duplicate motor recipes by @chochem in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3484 (5.09.50.66)
+> * Fix to Vanadium Redox Power Cell Recipe by @Nockyx in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3481 (5.09.50.65)
+>
+
+# Updated NewHorizonsCoreMod (2.6.75@BOTH --> 2.6.76@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/NewHorizonsCoreMod/compare/2.6.75...2.6.76
+>## What's Changed
+> * Removed Ultra Dense ME conduit recipe by @Nockyx in https://github.com/GTNewHorizons/NewHorizonsCoreMod/pull/1080 (2.6.76)
+>
+
+# Credits
+A special thanks to @Nockyx, @wlhlm, who contributed to this release!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 729 to 730.md b/releases/changelogs/nightly builds/changelog from nightly 729 to 730.md
@@ -0,0 +1,20 @@
+# Updated Binnie (2.4.3@BOTH --> 2.4.4@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/Binnie/compare/2.4.3...2.4.4
+>## What's Changed
+> * Fixing Waila showing incorrect blocks for logs by @Cardinalstars in https://github.com/GTNewHorizons/Binnie/pull/54 (2.4.4)
+>
+
+# Updated CodeChickenCore (1.3.9@BOTH --> 1.3.10@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/CodeChickenCore/compare/1.3.9...1.3.10
+>## What's Changed
+> * Allow colorful Tooltips by @glowredman in https://github.com/GTNewHorizons/CodeChickenCore/pull/24 (1.3.10)
+>
+
+# Updated GT5-Unofficial (5.09.50.66@BOTH --> 5.09.50.67@BOTH)
+**Full Changelog**: https://github.com/GTNewHorizons/GT5-Unofficial/compare/5.09.50.66...5.09.50.67
+>## What's Changed
+> * rebalance of plasma chain recipes by @Nockyx in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3468 (5.09.50.67)
+>
+
+# Credits
+A special thanks to @glowredman, who contributed to this release!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 730 to 731.md b/releases/changelogs/nightly builds/changelog from nightly 730 to 731.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 731 to 732.md b/releases/changelogs/nightly builds/changelog from nightly 731 to 732.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 732 to 733.md b/releases/changelogs/nightly builds/changelog from nightly 732 to 733.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 733 to 734.md b/releases/changelogs/nightly builds/changelog from nightly 733 to 734.md
@@ -0,0 +1,20 @@
+# Updated Angelica (1.0.0-beta18 -->  1.0.0-beta19)
+**Full Changelog**: https://github.com/GTNewHorizons/Angelica/compare/1.0.0-beta18...1.0.0-beta19
+>## What's Changed
+> * Handle more incompatible mods by @mitchej123 in https://github.com/GTNewHorizons/Angelica/pull/735 (1.0.0-beta19)
+>
+
+# Updated GT5-Unofficial (5.09.50.68 -->  5.09.50.69)
+**Full Changelog**: https://github.com/GTNewHorizons/GT5-Unofficial/compare/5.09.50.68...5.09.50.69
+>## What's Changed
+> * Restore hydration cell recipe by @FourIsTheNumber in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3507 (5.09.50.69)
+> * Add throughput to Wireless Energy Hatch tooltip by @Kogepan229 in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3506 (5.09.50.69)
+> * Improve EHE info and buff lava in EHE by @StaffiX in https://github.com/GTNewHorizons/GT5-Unofficial/pull/3494 (5.09.50.69)
+>
+
+# Updated GTNH-Intergalactic (1.4.24 -->  1.4.25)
+**Full Changelog**: https://github.com/GTNewHorizons/GTNH-Intergalactic/compare/1.4.24...1.4.25
+>## What's Changed
+> * circuit oredict fixes by @chochem in https://github.com/GTNewHorizons/GTNH-Intergalactic/pull/82 (1.4.25)
+>
+
diff --git a/releases/changelogs/nightly builds/changelog from nightly 734 to 735.md b/releases/changelogs/nightly builds/changelog from nightly 734 to 735.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 735 to 736.md b/releases/changelogs/nightly builds/changelog from nightly 735 to 736.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 736 to 737.md b/releases/changelogs/nightly builds/changelog from nightly 736 to 737.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 737 to 738.md b/releases/changelogs/nightly builds/changelog from nightly 737 to 738.md
@@ -0,0 +1 @@
+# Nothing changed this time!
diff --git a/releases/changelogs/nightly builds/changelog from nightly 738 to 739.md b/releases/changelogs/nightly builds/changelog from nightly 738 to 739.md
@@ -0,0 +1,6 @@
+# Updated StructureLib (1.3.5 -->  1.3.6)
+**Full Changelog**: https://github.com/GTNewHorizons/StructureLib/compare/1.3.5...1.3.6
+>## What's Changed
+> * Send correct identifier when instrumenting by @Lyfts in https://github.com/GTNewHorizons/StructureLib/pull/34 (1.3.6)
+>
+