Merge pull request #9 from ZZZank/enlightened_develop

2.4.0: Might be the biggest update since 2.0.0
ZZZank · Nov 30, 2023 · b903f09 · b903f09
2 parents 5de8f0f + 91bc1a0
commit b903f09
Show file tree

Hide file tree

Showing 110 changed files with 1,856 additions and 3,979 deletions.
diff --git a/.gitignore b/.gitignore
@@ -231,9 +231,10 @@ pregen/supporters.json
 config/rubidium-options.json
 config/appliedenergistics2-client.toml
 config/jei/ingredient-list-mod-sort-order.ini
-config/jei/ingredient-list-mod-sort-order.ini
 config/jei/ingredient-list-type-sort-order.ini
 config/jei/recipe-category-sort-order.ini
 local/ftbchunks/client-config.snbt
 launcher_profiles.json
 config/sidebar_buttons.json
+server_files/mainpack.zip
+server_files_expert/mainpack.zip
diff --git a/.vscode/probe.code-snippets b/.vscode/probe.code-snippets
diff --git a/MODLIST.md b/MODLIST.md
@@ -1,4 +1,4 @@
-## Enlightened6 - 2.3.9
+## Enlightened6 - 2.4.0
   * [DustrialDecor-1.3.1.jar](https://www.curseforge.com/minecraft/mc-mods/dustrial-decor/files/3845940) (by [BlueDuckYT](https://www.curseforge.com/members/blueduckyt/projects))
   * [ae2ao-8.1.1-1.16.jar](https://www.curseforge.com/minecraft/mc-mods/forge-ae2-additional-opportunity/files/4076650) (by [DomamaN202](https://www.curseforge.com/members/domaman202/projects))
   * [abnormals_delight-1.16.5-1.2.1.jar](https://www.curseforge.com/minecraft/mc-mods/abnormals-delight/files/3549585) (by [TeamAbnormals](https://www.curseforge.com/members/teamabnormals/projects))
@@ -34,7 +34,7 @@
   * [BetterAdvancements-1.16.5-0.1.1.115.jar](https://www.curseforge.com/minecraft/mc-mods/better-advancements/files/3404330) (by [way2muchnoise](https://www.curseforge.com/members/way2muchnoise/projects))
   * [betterbiomeblend-1.16.4-1.2.9-forge.jar](https://www.curseforge.com/minecraft/mc-mods/better-biome-blend/files/3421281) (by [FionaTheMortal](https://www.curseforge.com/members/fionathemortal/projects))
   * [BetterBurning-1.16.5-6.0.8.jar](https://www.curseforge.com/minecraft/mc-mods/better-burning/files/3732288) (by [DarkhaxDev](https://www.curseforge.com/members/darkhaxdev/projects))
-  * [betterendforge-1.16.5-2.5.jar](https://www.curseforge.com/minecraft/mc-mods/betterend-re-forked/files/3523090) (by [someoneelsewastaken](https://www.curseforge.com/members/someoneelsewastaken/projects))
+  * [better-end-potato-edition-1.16.5-2.10.6.jar](https://www.curseforge.com/minecraft/mc-mods/better-end-potato-edition/files/4828383) (by [pOtAto__bOy](https://www.curseforge.com/members/potato__boy/projects))
   * [biomeidfixer-1.16.5-1.0.1.s5.jar](https://www.curseforge.com/minecraft/mc-mods/biome-id-fixer/files/3446595) (by [desagas](https://www.curseforge.com/members/desagas/projects))
   * [BHMenu-Forge-1.16.5-2.4.1.jar](https://www.curseforge.com/minecraft/mc-mods/bisecthosting-server-integration-menu-forge/files/4743098) (by [BisectHosting](https://www.curseforge.com/members/bisecthosting/projects))
   * [BloodMagic-1.16.4-3.1.13-39.jar](https://www.curseforge.com/minecraft/mc-mods/blood-magic/files/3870899) (by [WayofTime](https://www.curseforge.com/members/wayoftime/projects))
@@ -66,7 +66,6 @@
   * [collective-1.16.5-5.49.jar](https://www.curseforge.com/minecraft/mc-mods/collective/files/4312565) (by [Serilum](https://www.curseforge.com/members/serilum/projects))
   * [comforts-forge-1.16.5-4.0.1.5.jar](https://www.curseforge.com/minecraft/mc-mods/comforts/files/3681503) (by [TheIllusiveC4](https://www.curseforge.com/members/theillusivec4/projects))
   * [CommonCapabilities-1.16.5-2.8.0.jar](https://www.curseforge.com/minecraft/mc-mods/common-capabilities/files/3482420) (by [kroeser](https://www.curseforge.com/members/kroeser/projects))
-  * [compactcrafting-1.0.0.jar](https://www.curseforge.com/minecraft/mc-mods/compact-crafting/files/3545959) (by [RobotGryphon](https://www.curseforge.com/members/robotgryphon/projects))
   * [compactmachines-4.0.0-beta.2.jar](https://www.curseforge.com/minecraft/mc-mods/compact-machines/files/3229196) (by [davenonymous](https://www.curseforge.com/members/davenonymous/projects))
   * [Compote-1.0.2.jar](https://www.curseforge.com/minecraft/mc-mods/compote/files/3193714) (by [thenatekirby](https://www.curseforge.com/members/thenatekirby/projects))
   * [configswapper-2.7.jar](https://www.curseforge.com/minecraft/mc-mods/config-swapper/files/3683079) (by [Darkere](https://www.curseforge.com/members/darkere/projects))
@@ -100,6 +99,7 @@
   * [dungeons_plus-1.16.5-1.1.5.jar](https://www.curseforge.com/minecraft/mc-mods/dungeons-plus/files/3318948) (by [ModdingLegacy](https://www.curseforge.com/members/moddinglegacy/projects))
   * [dynviewdist-2.0.jar](https://www.curseforge.com/minecraft/mc-mods/dynamic-view/files/3358883) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
   * [curiouselytra-forge-1.16.5-4.0.2.4.jar](https://www.curseforge.com/minecraft/mc-mods/elytra-slot/files/3522097) (by [TheIllusiveC4](https://www.curseforge.com/members/theillusivec4/projects))
+  * [embeddium-0.2.10+mc1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/embeddium/files/4894270) (by [embeddedt](https://www.curseforge.com/members/embeddedt/projects))
   * [EmendatusEnigmatica-1.2.16-build.46+mc1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/emendatus-enigmatica/files/4174294) (by [Ridanisaurus](https://www.curseforge.com/members/ridanisaurus/projects))
   * [EnchantmentDescriptions-1.16.5-7.1.23.jar](https://www.curseforge.com/minecraft/mc-mods/enchantment-descriptions/files/4757009) (by [DarkhaxDev](https://www.curseforge.com/members/darkhaxdev/projects))
   * [EnderStorage-1.16.5-2.8.0.170-universal.jar](https://www.curseforge.com/minecraft/mc-mods/ender-storage-1-8/files/3737982) (by [covers1624](https://www.curseforge.com/members/covers1624/projects))
@@ -138,7 +138,6 @@
   * [geckolib-forge-1.16.5-3.0.106.jar](https://www.curseforge.com/minecraft/mc-mods/geckolib/files/4182600) (by [Gecko](https://www.curseforge.com/members/gecko/projects))
   * [glassential-forge-1.16.5-1.1.7.jar](https://www.curseforge.com/minecraft/mc-mods/glassential/files/3413072) (by [Lykrast](https://www.curseforge.com/members/lykrast/projects))
   * [guardvillagers-1.16.5.1.2.6.jar](https://www.curseforge.com/minecraft/mc-mods/guard-villagers/files/3449429) (by [almightytallestred](https://www.curseforge.com/members/almightytallestred/projects))
-  * [gunswithoutroses-1.16.5-1.0.9.jar](https://www.curseforge.com/minecraft/mc-mods/guns-without-roses/files/3323323) (by [Lykrast](https://www.curseforge.com/members/lykrast/projects))
   * [Iceberg-1.16.5-1.0.45.jar](https://www.curseforge.com/minecraft/mc-mods/iceberg/files/3943132) (by [Grend_G](https://www.curseforge.com/members/grend_g/projects))
   * [ImmersiveEngineering-1.16.5-5.1.0-148.jar](https://www.curseforge.com/minecraft/mc-mods/immersive-engineering/files/3809596) (by [BluSunrize](https://www.curseforge.com/members/blusunrize/projects))
   * [ImmersivePetroleum-1.16.5-3.4.0-20.jar](https://www.curseforge.com/minecraft/mc-mods/immersive-petroleum/files/4461132) (by [Flaxbeard](https://www.curseforge.com/members/flaxbeard/projects))
@@ -194,8 +193,9 @@
   * [MekanismGenerators-1.16.5-10.1.2.457.jar](https://www.curseforge.com/minecraft/mc-mods/mekanism-generators/files/3659391) (by [bradyaidanc](https://www.curseforge.com/members/bradyaidanc/projects))
   * [MekanismTools-1.16.5-10.1.2.457.jar](https://www.curseforge.com/minecraft/mc-mods/mekanism-tools/files/3659392) (by [bradyaidanc](https://www.curseforge.com/members/bradyaidanc/projects))
   * [mininggadgets-1.7.6.jar](https://www.curseforge.com/minecraft/mc-mods/mining-gadgets/files/3902532) (by [Direwolf20](https://www.curseforge.com/members/direwolf20/projects))
+  * [dummmmmmy-1.16.5-1.3.3.jar](https://www.curseforge.com/minecraft/mc-mods/mmmmmmmmmmmm/files/4529749) (by [MehVahdJukaar](https://www.curseforge.com/members/mehvahdjukaar/projects))
   * [modnametooltip_1.16.2-1.15.0.jar](https://www.curseforge.com/minecraft/mc-mods/mod-name-tooltip/files/3038982) (by [mezz](https://www.curseforge.com/members/mezz/projects))
-  * [modernfix-forge-5.9.2+mc1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/modernfix/files/4849233) (by [embeddedt](https://www.curseforge.com/members/embeddedt/projects))
+  * [modernfix-forge-5.9.3+mc1.16.5.jar](https://www.curseforge.com/minecraft/mc-mods/modernfix/files/4862989) (by [embeddedt](https://www.curseforge.com/members/embeddedt/projects))
   * [modular-routers-1.16.5-7.5.46.jar](https://www.curseforge.com/minecraft/mc-mods/modular-routers/files/4480547) (by [desht_08](https://www.curseforge.com/members/desht_08/projects))
   * [selene-1.16.5-1.9.0.jar](https://www.curseforge.com/minecraft/mc-mods/selene/files/3517008) (by [MehVahdJukaar](https://www.curseforge.com/members/mehvahdjukaar/projects))
   * [[1.16.5]_More_Crafting _Tables_Forge_2.3.0.jar](https://www.curseforge.com/minecraft/mc-mods/more-crafting-tables-for-forge/files/4734101) (by [DaveDuart](https://www.curseforge.com/members/daveduart/projects))
@@ -250,7 +250,6 @@
   * [rftoolsstorage-1.16-2.0.19.jar](https://www.curseforge.com/minecraft/mc-mods/rftools-storage/files/3771411) (by [McJty](https://www.curseforge.com/members/mcjty/projects))
   * [rftoolsutility-1.16-3.1.16.jar](https://www.curseforge.com/minecraft/mc-mods/rftools-utility/files/3813656) (by [McJty](https://www.curseforge.com/members/mcjty/projects))
   * [rhino-forge-1605.1.5-build.75.jar](https://www.curseforge.com/minecraft/mc-mods/rhino/files/3525704) (by [LatvianModder](https://www.curseforge.com/members/latvianmodder/projects))
-  * [rubidium-mc1.16.5-0.2.13.jar](https://www.curseforge.com/minecraft/mc-mods/rubidium/files/4743730) (by [Asek3](https://www.curseforge.com/members/asek3/projects))
   * [SaveYourPets-1.16.2-1.0.0.7.jar](https://www.curseforge.com/minecraft/mc-mods/save-your-pets/files/3626454) (by [MacTso](https://www.curseforge.com/members/mactso/projects))
   * [scannable-1.16.5-forge-1.7.6+00198b7.jar](https://www.curseforge.com/minecraft/mc-mods/scannable/files/3565727) (by [Sangar_](https://www.curseforge.com/members/sangar_/projects))
   * [smoothchunk1.16.5-2.0.jar](https://www.curseforge.com/minecraft/mc-mods/smooth-chunk-save/files/4453876) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))

diff --git a/automation/modpack-uploader.ps1 b/automation/modpack-uploader.ps1
@@ -294,6 +294,11 @@ function New-ServerFiles {
         Write-Host 
         Write-Host "Creating server files..." -ForegroundColor Cyan
         Write-Host 
+        if ($uploadExpertMode) {
+            Copy-Item -Path "$CLIENT_ZIP_NAME.zip" -Destination "server_files_expert\mainpack.zip" -ErrorAction SilentlyContinue
+        }else {
+            Copy-Item -Path "$CLIENT_ZIP_NAME.zip" -Destination "server_files\mainpack.zip" -ErrorAction SilentlyContinue
+        }
         7z a -tzip $serverZip "$SERVER_FILES_FOLDER\*"
         Move-Item -Path "automation\$serverZip" -Destination $serverZip -ErrorAction SilentlyContinue
         Write-Host "Server files created!" -ForegroundColor Green

diff --git a/automation/settings.ps1 b/automation/settings.ps1
@@ -29,7 +29,7 @@ $MODPACK_NAME = "Enlightened6"
 $CLIENT_NAME = "Enlightened6"
 
 # Version Of The Modpack
-$MODPACK_VERSION = "2.3.9"
+$MODPACK_VERSION = "2.4.0"
 
 # Last Version Of The Modpack
 # Needed For Changelog Parsing