diff --git a/.github/buildtools/modpack/manifest.json b/.github/buildtools/modpack/manifest.json
index c1504b660..86a7706a2 100644
--- a/.github/buildtools/modpack/manifest.json
+++ b/.github/buildtools/modpack/manifest.json
@@ -187,7 +187,7 @@
},
{
"projectID": 433760,
- "fileID": 5285277,
+ "fileID": 5307870,
"required": true
},
{
@@ -337,7 +337,7 @@
},
{
"projectID": 513402,
- "fileID": 5311942,
+ "fileID": 5314558,
"required": true
},
{
@@ -370,6 +370,11 @@
"fileID": 5293020,
"required": true
},
+ {
+ "projectID": 580555,
+ "fileID": 5204261,
+ "required": true
+ },
{
"projectID": 841001,
"fileID": 5273372,
@@ -556,13 +561,13 @@
"required": true
},
{
- "projectID": 429371,
- "fileID": 4884096,
+ "projectID": 688367,
+ "fileID": 4719290,
"required": true
},
{
- "projectID": 688367,
- "fileID": 4719290,
+ "projectID": 429371,
+ "fileID": 4884096,
"required": true
},
{
@@ -605,11 +610,6 @@
"fileID": 5217955,
"required": true
},
- {
- "projectID": 580555,
- "fileID": 5204261,
- "required": true
- },
{
"projectID": 952386,
"fileID": 4971650,
@@ -691,13 +691,13 @@
"required": true
},
{
- "projectID": 890405,
- "fileID": 5253480,
+ "projectID": 938643,
+ "fileID": 5109692,
"required": true
},
{
- "projectID": 938643,
- "fileID": 5109692,
+ "projectID": 890405,
+ "fileID": 5253480,
"required": true
},
{
@@ -732,7 +732,7 @@
},
{
"projectID": 407206,
- "fileID": 5186927,
+ "fileID": 5312360,
"required": true
},
{
diff --git a/.github/buildtools/modpack/modlist.html b/.github/buildtools/modpack/modlist.html
index 4ce38815f..76b8966ef 100644
--- a/.github/buildtools/modpack/modlist.html
+++ b/.github/buildtools/modpack/modlist.html
@@ -70,6 +70,7 @@
Ksyxis (by VidTu)
GregTech Revival 32x (by ILAORE)
Recipe Essentials[Forge/Fabric] (by someaddon)
+EMI (by EmilyPloszaj)
KubeJS TFC (by NotEnoughMail)
FTB Essentials (Forge & Fabric) (by FTB)
Get It Together, Drops! (by bl4ckscor3)
@@ -107,8 +108,8 @@
CraftPresence (by CDAGaming_)
Packet Fixer (by TonimatasDEV)
Cucumber Library (by BlakeBr0)
-KubeJS Create (by LatvianModder)
ME Requester (by Relentless)
+KubeJS Create (by LatvianModder)
TerraFirmaCraft (by Dries007)
Inventory HUD+ (by dmitrylovin)
Better Foliage Renewed (by EERussianguy)
@@ -117,7 +118,6 @@
TFC Water Flasks (by gaelmare)
YetAnotherConfigLib (by XanderIsDev)
Applied Energistics 2 Wireless Terminals (by Mari_023)
-EMI (by EmilyPloszaj)
TFC Vessel Tooltip (by HermitOwO)
Embeddium (by embeddedt)
No Report Button (by pices1237532)
@@ -134,8 +134,8 @@
Better Ping Display (by Quintinity)
Jade Addons (Forge) (by Snownee)
AE2 Insert Export Card (by Ultramegaaa)
-GregTechCEu Modern (by KilaBash)
Melody (by Keksuccino)
+GregTechCEu Modern (by KilaBash)
Let Me Despawn (by frikinjay)
TFC Ambiental - Second edition (by LobsterJonn)
Better Third Person (by Socolio)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0d6f5e44d..cd1b81051 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -111,7 +111,7 @@ jobs:
run: |
mkdir -p .minecraft
mkdir -p flame
- mv -vf {config,defaultconfigs,kubejs,mods} .minecraft/
+ mv -vf {config,defaultconfigs,kubejs,mods,resourcepacks} .minecraft/
mv -vf .github/buildtools/modpack/mmc-pack.json ./
mv -vf .github/buildtools/modpack/instance.cfg ./
mv -vf .github/buildtools/modpack/modlist.html ./
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9df5ce755..7d7827170 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@
### Updated mods
- ???
-## [0.7.8] - 03.05.2024
+## [0.7.8] - 05.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,9 +19,12 @@
- 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.5 -> 1.1.4
-- TerraFirmaGreg-Core 0.5.3 -> 0.5.5
+- EMI -> 1.1.4
+- TerraFirmaGreg-Core -> 0.5.6
+- Chat_heads -> 0.10.33
+- Not Enough Animations -> 1.7.3
## [0.7.7] - 01.05.2024
### Fixes
diff --git a/mods b/mods
index a8353200e..c580b1e6f 160000
--- a/mods
+++ b/mods
@@ -1 +1 @@
-Subproject commit a8353200ed43ed943e916bb9bea25eab15e75b64
+Subproject commit c580b1e6f67b6b6e0f7caeb8220f97195ed6239f