Revert "Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x"

This reverts commit 0a9cb01b1e, reversing
changes made to eef2cb7b02.

.github/buildtools/modpack/manifest.json

@@ -187,7 +187,7 @@
     },
     {
       "projectID": 433760,
-      "fileID": 5307870,
+      "fileID": 5285277,
       "required": true
     },
     {
@@ -337,7 +337,7 @@
     },
     {
       "projectID": 513402,
-      "fileID": 5314558,
+      "fileID": 5311942,
       "required": true
     },
     {
@@ -370,11 +370,6 @@
       "fileID": 5293020,
       "required": true
     },
-    {
-      "projectID": 580555,
-      "fileID": 5204261,
-      "required": true
-    },
     {
       "projectID": 841001,
       "fileID": 5273372,
@@ -561,13 +556,13 @@
       "required": true
     },
     {
-      "projectID": 688367,
-      "fileID": 4719290,
+      "projectID": 429371,
+      "fileID": 4884096,
       "required": true
     },
     {
-      "projectID": 429371,
-      "fileID": 4884096,
+      "projectID": 688367,
+      "fileID": 4719290,
       "required": true
     },
     {
@@ -610,6 +605,11 @@
       "fileID": 5217955,
       "required": true
     },
+    {
+      "projectID": 580555,
+      "fileID": 5204261,
+      "required": true
+    },
     {
       "projectID": 952386,
       "fileID": 4971650,
@@ -691,13 +691,13 @@
       "required": true
     },
     {
-      "projectID": 938643,
-      "fileID": 5109692,
+      "projectID": 890405,
+      "fileID": 5253480,
       "required": true
     },
     {
-      "projectID": 890405,
-      "fileID": 5253480,
+      "projectID": 938643,
+      "fileID": 5109692,
       "required": true
     },
     {
@@ -732,7 +732,7 @@
     },
     {
       "projectID": 407206,
-      "fileID": 5312360,
+      "fileID": 5186927,
       "required": true
     },
     {

.github/buildtools/modpack/modlist.html

@@ -70,7 +70,6 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ksyxis">Ksyxis (by VidTu)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/texture-packs/gregtech-revival-32x">GregTech Revival 32x (by ILAORE)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/recipe-essentials-forge-fabric">Recipe Essentials[Forge/Fabric] (by someaddon)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/emi">EMI (by EmilyPloszaj)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/kubejs-tfc">KubeJS TFC (by NotEnoughMail)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-essentials-forge">FTB Essentials (Forge & Fabric) (by FTB)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/get-it-together-drops">Get It Together, Drops! (by bl4ckscor3)</a></li>
@@ -108,8 +107,8 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/craftpresence">CraftPresence (by CDAGaming_)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/packet-fixer">Packet Fixer (by TonimatasDEV)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/cucumber">Cucumber Library (by BlakeBr0)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/merequester">ME Requester (by Relentless)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/kubejs-create">KubeJS Create (by LatvianModder)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/merequester">ME Requester (by Relentless)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft">TerraFirmaCraft (by Dries007)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-hud-forge">Inventory HUD+ (by dmitrylovin)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-foliage-renewed">Better Foliage Renewed (by EERussianguy)</a></li>
@@ -118,6 +117,7 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/water-flasks">TFC Water Flasks (by gaelmare)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/yacl">YetAnotherConfigLib (by XanderIsDev)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2-wireless-terminals">Applied Energistics 2 Wireless Terminals (by Mari_023)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/emi">EMI (by EmilyPloszaj)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-vessel-tooltip">TFC Vessel Tooltip (by HermitOwO)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/embeddium">Embeddium (by embeddedt)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/no-report-button">No Report Button (by pices1237532)</a></li>
@@ -134,8 +134,8 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-ping-display">Better Ping Display (by Quintinity)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/jade-addons">Jade Addons (Forge) (by Snownee)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ae2-insert-export-card">AE2 Insert Export Card (by Ultramegaaa)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/melody">Melody (by Keksuccino)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern">GregTechCEu Modern (by KilaBash)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/melody">Melody (by Keksuccino)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/let-me-despawn">Let Me Despawn (by frikinjay)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-ambiental-second-edition">TFC Ambiental - Second edition (by LobsterJonn)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-third-person">Better Third Person (by Socolio)</a></li>

.github/workflows/release.yml

@@ -111,7 +111,7 @@ jobs:
         run: |
           mkdir -p .minecraft
           mkdir -p flame
-          mv -vf {config,defaultconfigs,kubejs,mods,resourcepacks} .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/modlist.html ./

CHANGELOG.md

@@ -11,7 +11,7 @@
 ### Updated mods
 - ???
 
-## [0.7.8] - 05.05.2024
+## [0.7.8] - 03.05.2024
 ### Fixes
 - Fixed a bug where using GTCEu tools in the AstikoCarts plow caused the game to crash.
 - Fixed a bug where it was impossible to make feeders from TFC: Grooming Station.
@@ -19,12 +19,9 @@
 - Fixed a bug where the boiler could not accept river water.
 - Fixed a bug where recipes were incorrectly displayed in EMI. (The EMI version has been downgraded)
 - Fixed bug when spades cant be putted into tool rack.
-- Some quest fixes for 0.7.3 pump update.
 ### Updated mods
-- EMI -> 1.1.4
-- TerraFirmaGreg-Core -> 0.5.6
-- Chat_heads -> 0.10.33
-- Not Enough Animations -> 1.7.3
+- EMI 1.1.5 -> 1.1.4
+- TerraFirmaGreg-Core 0.5.3 -> 0.5.5
 
 ## [0.7.7] - 01.05.2024
 ### Fixes

mods

@@ -1 +1 @@
-Subproject commit c580b1e6f67b6b6e0f7caeb8220f97195ed6239f
+Subproject commit a8353200ed43ed943e916bb9bea25eab15e75b64