From 8fd62bef0d2d5935beb308a235d3aa8bfaeed81b Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Thu, 14 Dec 2023 19:20:15 +0500
Subject: [PATCH 1/4] Update release.yml

---
 .github/workflows/release.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7f8fb0c7b..ff6dad988 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -83,13 +83,14 @@ jobs:
             ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-server.zip
 
       - name: Discord notification
-        uses: LeGitHubDeTai/github-to-discord@v1.5.0
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.RELEASES_1_20 }}
-          DISCORD_USERNAME: GitHub
-          DISCORD_AVATAR: https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/logo_new_year.png
-          MESSAGE_TITLE: Release ${{ steps.changelog.outputs.version }}
-          MESSAGE_DESCRIPTION: ${{ steps.changelog.outputs.description }}
-          MESSAGE_URL: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/tree/main/CHANGELOG.md
-          MESSAGE_COLOR: 5814783
-          FOOTER_TEXT: ${{ steps.changelog.outputs.date }}
+        uses: tsickert/discord-webhook@v5.4.0
+        with:
+          webhook-url: ${{ secrets.RELEASES_1_20 }}
+          username: "GitHub"
+          avatar-url: https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/logo_new_year.png
+          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 }}
+

From 2acff1dafd3282b215991e669a87f02973fa953e Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Thu, 14 Dec 2023 19:24:46 +0500
Subject: [PATCH 2/4] Update release.yml

---
 .github/workflows/release.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ff6dad988..dbc5b5360 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -40,11 +40,12 @@ jobs:
       - name: Archive CF
         run: |
           mkdir -p overrides
-          cp -r {config,defaultconfigs,kubejs,mods}  overrides/
+          cp -r {config,defaultconfigs,kubejs}  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: |
+          cp -r mods overrides/
           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/
 

From 334000dbc7816e285c4f7797d9d98e419ff5cbaf Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Thu, 14 Dec 2023 19:30:07 +0500
Subject: [PATCH 3/4] Update release.yml

---
 .github/workflows/release.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dbc5b5360..6e7200554 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -41,12 +41,16 @@ jobs:
         run: |
           mkdir -p overrides
           cp -r {config,defaultconfigs,kubejs}  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
+          mv -vf .github/buildtools/modpack/manifest.json ./
+          mv -vf .github/buildtools/modpack/modlist.json ./ 
+          zip -r ./TerraFirmaGreg-1.20.x-${{ steps.get_version.outputs.version }}-cf.zip manifest.json modlist.html overrides
 
       - name: Archive MMC
         run: |
           cp -r mods overrides/
-          mv -vf overrides/ .minecraft/ 
+          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 .github/buildtools/modpack/mmc-pack.json .github/buildtools/modpack/instance.cfg .minecraft/
 
       - name: Archive Server

From d49bf99f3c459b232a5d0f991917d51ea4a9037d Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Thu, 14 Dec 2023 19:32:43 +0500
Subject: [PATCH 4/4] Update release.yml

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6e7200554..bf1b30ed4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
           mkdir -p overrides
           cp -r {config,defaultconfigs,kubejs}  overrides/
           mv -vf .github/buildtools/modpack/manifest.json ./
-          mv -vf .github/buildtools/modpack/modlist.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
 
       - name: Archive MMC