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 @@
 <ul>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/first-person-model">First-person Model (Forge/Fabric) (by tr7zw)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/creativecore">CreativeCore (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/astikor-carts-redux">AstikorCarts Redux (by jusipat)</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/terrafirmagreg-core">TerraFirmaGreg Core (by Exception)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/enhancedvisuals">EnhancedVisuals (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/drippy-loading-screen">Drippy Loading Screen [Forge] (by Keksuccino)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/curios">Curios API (Forge/NeoForge) (by TheIllusiveC4)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/createaddition">Create Crafts & Additions (by MRHminer)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/kubejs">KubeJS (by LatvianModder)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/default-options">Default Options (by BlayTheNinth)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/blur-forge">Blur (Forge) (by dimadencep)</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/lootjs">LootJS: KubeJS Addon (by Lytho)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/firmacivilization">Firma: Civilization (TFC) (by alekiponi)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/xaeros-world-map">Xaero's World Map (by xaero96)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/smooth-boot-reloaded">Smooth Boot (Reloaded) (by AbdElAziz333)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-core">Sophisticated Core (by P3pp3rF1y)</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/chisels-bits">Chisels & Bits - For Forge (by AlgorithmX2)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/mouse-tweaks">Mouse Tweaks (by YaLTeR)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/oculus">Oculus (by Asek3)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-sorter">Inventory Sorter (by cpw)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-third-person">Better Third Person (by Socolio)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/playerrevive">PlayerRevive (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap">Xaero's Minimap (by xaero96)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks">Sophisticated Backpacks (by P3pp3rF1y)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cherished-worlds">Cherished Worlds (Fabric/Forge/NeoForge/Quilt) (by TheIllusiveC4)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/open-parties-and-claims">Open Parties and Claims (by xaero96)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/firmalife">FirmaLife (by EERussianguy)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/client-tweaks">Client Tweaks (by BlayTheNinth)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/canary">Canary (by AbdElAziz333)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items">Roughly Enough Items Fabric/Forge (REI) (by shedaniel)</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/applied-energistics-2">Applied Energistics 2 (by thetechnici4n)</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/cucumber">Cucumber Library (by BlakeBr0)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ambientsounds">AmbientSounds 5 (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/more-red">More Red (by Commoble)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cosmetic-armor-reworked">Cosmetic Armor Reworked (by LainMI)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastworkbench">FastWorkbench (by Shadows_of_Fire)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/konkrete">Konkrete [Forge] (by Keksuccino)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-library-forge">FTB Library (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/pick-up-notifier">Pick Up Notifier [Forge & Fabric] (by Fuzs)</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/astikor-carts-tfc">Astikor Carts TFC (by Verph)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/mouse-tweaks">Mouse Tweaks (by YaLTeR)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-xmod-compat">FTB XMod Compat (by FTB)</a></li>
-<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/treetap">Tree Tap (by LobsterJonn)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-quests-forge">FTB Quests (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/exposure">Exposure (by mortuusars)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-backpacks">Sophisticated Backpacks (by P3pp3rF1y)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/chatimage">ChatImage (by kulujun)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-compatibility-checker">Better Compatibility Checker (by Gaz_)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cosmetic-armor-reworked">Cosmetic Armor Reworked (by LainMI)</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/blur-forge">Blur (Forge) (by dimadencep)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/betterf3">BetterF3 (by cominixo)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2">Applied Energistics 2 (by thetechnici4n)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/clumps">Clumps (by Jaredlll08)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/canary">Canary (by AbdElAziz333)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-chat-reports">No Chat Reports (by Aizistral)</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/client-tweaks">Client Tweaks (by BlayTheNinth)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/patchouli">Patchouli (by Vazkii)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/small-ships">Small Ships [Fabric & Forge] (by talhanation)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/everlasting-skins">Everlasting Skins (by levosssilimo)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/corpse">Corpse (by henkelmax)</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/tool-belt">Tool Belt (by gigaherz)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/default-options">Default Options (by BlayTheNinth)</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/ambientsounds">AmbientSounds 5 (by CreativeMD)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/botarium">Botarium (by CodexAdrian)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/open-parties-and-claims">Open Parties and Claims (by xaero96)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/modernfix">ModernFix (by embeddedt)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastfurnace">FastFurnace (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/puzzles-lib">Puzzles Lib [Forge & Fabric] (by Fuzs)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/firmacivilization">Firma: Civilization (TFC) (by alekiponi)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ai-improvements">AI Improvements (by QueenOfMissiles)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-ranks-forge">FTB Ranks (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/serverconfig-updater">ServerConfig Updater (by Darkere)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/jade">Jade 🔍 (by Snownee)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-aged-alcohol">TFC Aged Alcohol (by HermitOwO)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/more-red">More Red (by Commoble)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastworkbench">FastWorkbench (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cherished-worlds">Cherished Worlds (Fabric/Forge/NeoForge/Quilt) (by TheIllusiveC4)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/resourceful-lib">Resourceful Lib (by ThatGravyboat)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/sophisticated-core">Sophisticated Core (by P3pp3rF1y)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastsuite">FastSuite (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/firmalife">FirmaLife (by EERussianguy)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items">Roughly Enough Items Fabric/Forge (REI) (by shedaniel)</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/ad-astra">Ad Astra (by AlexNijjar)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-quests-optimizer">FTB Quests Optimizer (by big_energy)</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/smooth-boot-reloaded">Smooth Boot (Reloaded) (by AbdElAziz333)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/placebo">Placebo (by Shadows_of_Fire)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/farsight">Farsight [Forge] (by someaddon)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmagreg-mod">TerraFirmaGreg (by Exception)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cupboard">Cupboard (by someaddon)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/not-enough-animations">Not Enough Animations (by tr7zw)</a></li>
-<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/itemphysic-lite">ItemPhysic Lite (by CreativeMD)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/barrels-2012">Barrels 2012 (by EERussianguy)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/create">Create (by simibubi)</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/dynamiclights-reforged">Magnesium/Rubidium Dynamic Lights (by Anthxny)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/get-it-together-drops">Get It Together, Drops! (by bl4ckscor3)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/kubejs">KubeJS (by LatvianModder)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-filter-system">FTB Filter System (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/architectury-api">Architectury API (Fabric/Forge/NeoForge) (by shedaniel)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/balm">Balm (Forge Edition) (by BlayTheNinth)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/drippy-loading-screen">Drippy Loading Screen [Forge] (by Keksuccino)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmaships">TerraFirmaShips (by w8b40t)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-config">Cloth Config API (Fabric/Forge/NeoForge) (by shedaniel)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/curios">Curios API (Forge/NeoForge) (by TheIllusiveC4)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/rhino">Rhino (by LatvianModder)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap">Xaero's Minimap (by xaero96)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/fancymenu-forge">FancyMenu [Forge] (by Keksuccino)</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/inventory-hud-forge">Inventory HUD+ (by dmitrylovin)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/create-steam-n-rails">Create: Steam 'n' Rails (by mattentosh)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/xaeros-world-map">Xaero's World Map (by xaero96)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-third-person">Better Third Person (by Socolio)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/first-person-model">First-person Model (Forge/Fabric) (by tr7zw)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/create">Create (by simibubi)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/entityculling">Entity Culling Fabric/Forge (by tr7zw)</a></li>
-<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/creativecore">CreativeCore (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/farsight">Farsight [Forge] (by someaddon)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cc-tweaked">CC: Tweaked (by SquidDev)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/treetap">Tree Tap (by LobsterJonn)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-aged-alcohol">TFC Aged Alcohol (by HermitOwO)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/corpse">Corpse (by henkelmax)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/barrels-2012">Barrels 2012 (by EERussianguy)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/itemphysic-lite">ItemPhysic Lite (by CreativeMD)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/architectury-api">Architectury API (Fabric/Forge/NeoForge) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/create-steam-n-rails">Create: Steam 'n' Rails (by mattentosh)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ferritecore">FerriteCore (Forge) (by malte0811)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items-hacks">REI Plugin Compatibilities (REIPC) (by shedaniel)</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/craftpresence">CraftPresence (by CDAGaming_)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/tool-belt">Tool Belt (by gigaherz)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/patchouli">Patchouli (by Vazkii)</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/astikor-carts-tfc">Astikor Carts TFC (by Verph)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-quests-forge">FTB Quests (Forge) (by FTB)</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/serverconfig-updater">ServerConfig Updater (by Darkere)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/not-enough-animations">Not Enough Animations (by tr7zw)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/simple-login">Simple Login (by seraph_jack)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/rubidium-extra">Rubidium Extra (by dimadencep)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cloth-config">Cloth Config API (Fabric/Forge/NeoForge) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastsuite">FastSuite (by Shadows_of_Fire)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/everlasting-skins">Everlasting Skins (by levosssilimo)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/modernfix">ModernFix (by embeddedt)</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/ftb-teams-forge">FTB Teams (Forge) (by FTB)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/inventory-sorter">Inventory Sorter (by cpw)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/resourceful-config">Resourceful Config (by ThatGravyboat)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/astikor-carts-redux">AstikorCarts Redux (by jusipat)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/oculus">Oculus (by Asek3)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/chatimage">ChatImage (by kulujun)</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/starlight-forge">Starlight (Forge) (by Spottedstar)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/additional-placements">Additional Placements (by firemerald)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-quests-optimizer">FTB Quests Optimizer (by big_energy)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/placebo">Placebo (by Shadows_of_Fire)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/cupboard">Cupboard (by someaddon)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/gcyr">Gregicality Rocketry (by screret)</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/ftb-ranks-forge">FTB Ranks (Forge) (by FTB)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fancymenu-forge">FancyMenu [Forge] (by Keksuccino)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/balm">Balm (Forge Edition) (by BlayTheNinth)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/betterf3">BetterF3 (by cominixo)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/fastfurnace">FastFurnace (by Shadows_of_Fire)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/dynamiclights-reforged">Magnesium/Rubidium Dynamic Lights (by Anthxny)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/exposure">Exposure (by mortuusars)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/puzzles-lib">Puzzles Lib [Forge & Fabric] (by Fuzs)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/rhino">Rhino (by LatvianModder)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items-hacks">REI Plugin Compatibilities (REIPC) (by shedaniel)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/better-compatibility-checker">Better Compatibility Checker (by Gaz_)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/no-chat-reports">No Chat Reports (by Aizistral)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ai-improvements">AI Improvements (by QueenOfMissiles)</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/ftb-filter-system">FTB Filter System (by FTB)</a></li>
+<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/pick-up-notifier">Pick Up Notifier [Forge & Fabric] (by Fuzs)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/rubidium-extra">Embeddium (Rubidium) Extra (by dimadencep)</a></li>
+<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">Jade 🔍 (by Snownee)</a></li>
 </ul>
diff --git a/mods b/mods
index d4cc1ce51..30f401a53 160000
--- a/mods
+++ b/mods
@@ -1 +1 @@
-Subproject commit d4cc1ce510c68572d2690c1abe36c3ff4e880f55
+Subproject commit 30f401a533106700c8b912af5314d1000b39e5e7