1.02

BinBashBanana · Aug 8, 2023 · d39c2c6 · d39c2c6
1 parent 90c4d5e
commit d39c2c6
Show file tree

Hide file tree

Showing 42 changed files with 3,516 additions and 519 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -9,11 +9,12 @@ This pack is essentially a mashup of Enigmatica 2 normal mode, Direwolf20 1.12.2
 A great all-purpose pack for beginners and experienced players.
 It is kitchen-sink style, however it includes Enigmatica 2's quest book to help you along.
 This pack is medium-heavy, requiring about 6 GB of ram allocated to perform well.
-I'd say the pack is just lighter than ATM3R.  
+I'd say the pack is just lighter than ATM3R.
+As of version 1.02, some mods from E2Eu are included.  
 This pack does NOT include: refined storage, gregtech, buildcraft, projectE, avaritia, mystical agriculture, others...
 
 ### [Full mod list](/MODLIST.md)
-### Latest release: 1.01
+### Latest release: 1.02 - [Changelog](/changelogs/CHANGELOG.md)
 
 ### Added mods
 <details>
@@ -22,34 +23,56 @@ click to show
 </summary>
 
 - actually computers
+- ae additions
+- ae2 fluid crafting rework
+- ae2 unofficial extended life
 - animus
+- aqua acrobatics
 - armory expansion
 - aroma1997s dimensional world
+- better questing unofficial
 - bonsai trees
 - born in a barn
 - chicken chunks
 - crossroads/essentials
+- /dank/null/no_RCE/
 - endergy
+- entity culling
 - exchangers
+- fluidlogged api
+- friendly chests
 - furniture mod
-- jeid
+- gas conduits
+- hesperus
+- integrated nbt
+- jei integration
+- jei utilities
+- lazy ae2
+- lazy ae2 patch
 - letsencryptcraft
 - mob grinding utils
 - mod name tooltip
 - morph
 - morpheus
 - netherportalfix
 - no tema stahp
+- normalasm (custom build, override)
+- packagedastral
+- packagedauto
+- packageddraconic
 - pressure pipes
 - projectred
+- proportional destruction particles
 - random things
 - roguelike dungeons
+- roughly enough ids
+- seared ladder backport
 - simply jetpacks 2
 - storage drawers extras
 - tatw (beta version)
 - the one probe
 - top addons
-- vanillafix (override because the file needed to be renamed)
+- universal tweaks
 - waim
 - waystones
 - worley caves
@@ -63,10 +86,17 @@ click to show
 click to show
 </summary>
 
+- ae2, wireless crafting terminal (in favor of ae2 unofficial extended life)
+- ai improvements, diet hoppers, ding, fastworkbench, fence jumper, no night vision flashing, quick leaf decay, swing through grass, toast control, unloader (in favor of universal tweaks)
+- better questing/standard expansion/quest book (in favor of better questing unofficial)
 - betterfps (very little fps improvement, use optifine instead)
+- /dank/null (in favor of /dank/null/no_RCE/)
+- extra cells (in favor of ae additions)
+- foamfix (in favor of vintagefix)
 - hwyla (in favor of the one probe)
-- lostcities (due to jeid incompatibility)
-- neid (in favor of jeid)
+- lostcities (due to jeid/reid incompatibility)
+- neid (in favor of roughly enough ids)
+- phosphor (in favor of hesperus)
 - recurrent complex (due to massive server lag)
 - wawla (in favor of the one probe)
 
@@ -82,7 +112,6 @@ click to show
 - streams rolled back to 0.4.8 to fix spongeforge incompatibility
 - animania addons added
 
-If you want LagGoggles on your spongeforge server, you'll need the latest version that doesn't require TickCentral. Use `LagGoggles-THIN-1.12.2-4.11-92.jar`. Clients can still connect with the latest version of LagGoggles.
 </details>
 
 ### Config changes
@@ -100,7 +129,7 @@ click to show
 - openblocks - increase elevator range
 - embers - decrease ancient golem spawn frequency
 - bug fixes
-- recipes for flux sponge, creative mana pool/tablet, marble hive
+- recipes for flux sponge, creative mana pool/tablet, marble hive, quest book
 
 </details>
 
@@ -117,6 +146,12 @@ java -Xmx6G -Xms5G -XX:+UseG1GC -XX:+ParallelRefProcEnabled -XX:MaxGCPauseMillis
 ```
 Note: you can usually get away with 4 GB, but 6 GB is better especially for pregen.
 
+### Extra notes for servers
+- Do not use chunk pregenerator due to incompatibilities with reid/jeid. Use `/forge generate` until it is fixed. See [RoughlyEnoughIDs#14](https://github.com/TerraFirmaCraft-The-Final-Frontier/RoughlyEnoughIDs/issues/14) for more information.
+- If you want recurrent complex structures in your world, add the mod before you pregenerate the world, then remove it.
+- If you want LagGoggles on your spongeforge server, you'll need the latest version that doesn't require TickCentral. Use `LagGoggles-THIN-1.12.2-4.11-92.jar`. Clients can still connect with the latest version of LagGoggles.
+- I have included a patched build of NormalASM that fixes a crash with spongeforge. See issue 194 for more information. You will also need to set `threadPriorityFix=false` in normalasm.cfg (server only).
+
 ### Recommended user mods/resource packs
 - [OptiFine - HIGHLY recommended](https://optifine.net/adloadx?f=OptiFine_1.12.2_HD_U_G5.jar)
 - [Faithful32 Modded](https://github.com/F32Organization/Faithful32-1.12.2)
@@ -139,7 +174,8 @@ click to show
 - the list is gone lol
 
 maybe in future updates:
-- downgrade immersive tech to 1.8.94
+- nothirium
+- mo creatures extended
 
 #### Pack files
 - curseforge

diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,8 @@ config/MouseTweaks.cfg
 config/jei/worldSettings.cfg
 config/jei/lookupHistory.zip
 config/jei/bookmarks.ini
+config/normalasm
+config/tconstruct_oredictcache.dat
 zs_export.json
 .curseclient
 .ReAuth.cfg
@@ -76,6 +78,7 @@ eula.txt
 banned-players.json
 banned-ips.json
 ChangelogGenerator.jar
+optionsshaders.txt
 
 # Instance Sync
 **/*.jar

diff --git a/MODLIST.md b/MODLIST.md
@@ -9,8 +9,7 @@ Generate list with `ls | sed 's/^/- /g'`
 - actuallycomputers-2.2.0.jar
 - AdvancedRocketry-1.12.2-2.0.0-17.jar
 - ae2stuff-0.7.0.4-mc1.12.2.jar
-- AE2WTLib-1.12.2-1.0.34.jar
-- AIImprovements-1.12-0.0.1b3.jar
+- AEAdditions-1.12.2-1.3.8.jar
 - AkashicTome-1.2-12.jar
 - ancientwarfare-1.12.2-2.7.0.1038.jar
 - animania-1.12.2-base-2.0.3.28.jar
@@ -20,7 +19,8 @@ Generate list with `ls | sed 's/^/- /g'`
 - Animus-1.12-2.1.7.jar
 - AppleCore-mc1.12.2-3.4.0.jar
 - AppleSkin-mc1.12-1.0.14.jar
-- appliedenergistics2-rv6-stable-7.jar
+- appliedenergistics2-rv6-stable-7-extended_life-v0.55.21.jar
+- AquaAcrobatics-1.15.3.jar
 - architecturecraft-1.12-3.108.jar
 - armoryexpansion-1.4.2.jar
 - Aroma1997Core-1.12.2-2.0.0.2.jar
@@ -30,10 +30,10 @@ Generate list with `ls | sed 's/^/- /g'`
 - backpack-3.0.2-1.12.2.jar
 - badwithernocookiereloaded-1.12.2-3.4.18.jar
 - Baubles-1.12-1.5.2.jar
-- bdlib-1.14.3.12-mc1.12.2.jar
+- bdlib-1.14.4.1-mc1.12.2.jar
 - BetterAdvancements-1.12.2-0.1.0.77.jar
 - BetterBuildersWands-1.12.2-0.13.2.271+5997513.jar
-- BetterQuesting-3.5.329.jar
+- BetterQuestingUnofficial-4.1.0.jar
 - BiblioCraft[v2.4.6][MC1.12.2].jar
 - binnie-mods-1.12.2-2.5.1.203.jar
 - BiomesOPlenty-1.12.2-7.0.1.2445-universal.jar
@@ -73,41 +73,40 @@ Generate list with `ls | sed 's/^/- /g'`
 - CustomMainMenu-MC1.12.2-2.0.9.1.jar
 - Cyclic-1.12.2-1.20.14.jar
 - CyclopsCore-1.12.2-1.6.7.jar
-- DankNull-1.12.2-1.7.91.jar
+- DankNull-1.12.2-1.8.101.jar
 - DarkUtils-1.12.2-1.8.230.jar
 - DefaultOptions_1.12.2-9.2.8.jar
 - demagnetize-1.12.2-1.1.2.jar
-- diethopper-1.1.jar
-- Ding-1.12.2-1.0.2.jar
 - dirt2path-1.8.0.jar
 - DiscordSuite-2.2.4.jar
 - Draconic-Evolution-1.12.2-2.3.28.354-universal.jar
 - EmbersRekindled-1.19.jar
-- EnderCore-1.12.2-0.5.77.jar
-- EnderIO-1.12.2-5.3.70.jar
-- EnderIO-endergy-1.12.2-5.3.70.jar
+- EnderCore-1.12.2-0.5.78.jar
+- EnderIO-1.12.2-5.3.72.jar
+- EnderIO-conduits-mekanism-1.12.2-5.3.72.jar
+- EnderIO-endergy-1.12.2-5.3.72.jar
 - EnderStorage-1.12.2-2.4.6.137-universal.jar
 - engineers_doors-1.12.2-0.9.1.jar
+- EntityCulling-1.12.2-6.4.1.jar
 - environmentalmaterials-1.12.2-1.0.20.1.jar
 - environmentaltech-1.12.2-2.0.20.1.jar
 - essentials-1.12.2-1.2.1.jar
 - Exchangers-1.12.2-2.10.2.jar
 - ExtraBitManipulation-1.12.2-3.4.1.jar
-- ExtraCells-1.12.2-2.6.5.jar
 - ExtraRails-1.12-1.3.0.jar
 - extrautils2-1.12-1.9.9.jar
 - ExtremeReactors-1.12.2-0.4.5.68.jar
 - FarmingForBlockheads_1.12.2-3.1.28.jar
 - Farseek-1.12-2.5.1.jar
 - FastFurnace-1.12.2-1.3.1.jar
-- FastWorkbench-1.12.2-1.7.4.jar
-- fencejumper-1.12-1.0.5.jar
 - flatcoloredblocks-mc1.12-6.8.jar
-- foamfix-0.10.15-1.12.2.jar
+- Fluid Craft for AE2-2.4.27-r.jar
+- Fluidlogged-API-v2.2.4-mc1.12.2.jar
 - forestry_1.12.2-5.8.2.422.jar
 - Forgelin-1.8.4.jar
 - ForgeMultipart-1.12.2-2.6.2.83-universal.jar
 - FpsReducer-mc1.12.2-1.20.jar
+- Friendly-Chests-v1.0.3-mc1.12.2.jar
 - FTBBackups-1.1.0.1.jar
 - FTBLib-5.4.7.2.jar
 - FTBUtilities-5.4.1.131.jar
@@ -128,6 +127,7 @@ Generate list with `ls | sed 's/^/- /g'`
 - industrialcraft-2-2.8.222-ex112.jar
 - industrialforegoing-1.12.2-1.12.13-237.jar
 - IntegratedDynamics-1.12.2-1.1.11.jar
+- integratednbt-1.2.2.jar
 - IntegratedTunnels-1.12.2-1.6.14.jar
 - IntegrationForegoing-1.12.2-1.11.jar
 - InventoryTweaks-1.64+dev.151.jar
@@ -137,19 +137,23 @@ Generate list with `ls | sed 's/^/- /g'`
 - JAOPCA-1.12.2-2.2.8.106.jar
 - jei_1.12.2-4.16.1.1003.jar
 - jeibees-0.9.0.5-mc1.12.2.jar
+- jeiintegration_1.12.2-1.6.0.jar
+- JEI-Utilities-1.12.2-0.2.12.jar
 - jeivillagers-1.12-1.0.2.jar
 - jepb-1.12-1.2.1.jar
 - jetif-1.12.2-1.5.2.jar
 - journeymap-1.12.2-5.7.1.jar
 - JustEnoughEnergistics-1.12.2-1.0.8.jar
 - just-enough-harvestcraft-1.12.2-1.7.2.jar
-- JustEnoughIDs-1.0.4-SNAPSHOT-thin.jar
 - JustEnoughPetroleum-0.1.jar
 - JustEnoughReactors-1.12.2-1.1.3.61.jar
 - JustEnoughResources-1.12.2-0.9.2.60.jar
 - JustSleep-1.0.0.1.jar
 - KleeSlabs_1.12.2-5.4.12.jar
+- lazy-ae2-1.12.2-1.1.26.jar
+- lazy-ae2-patch-1.1.0.jar
 - letsencryptcraft-1.10.2-1.2.0.jar
+- libnine-1.12.2-1.2.1.jar
 - librarianlib-1.12.2-4.22.jar
 - LibVulpes-1.12.2-0.4.2-25-universal.jar
 - lootcapacitortooltips-1.3.jar
@@ -167,6 +171,7 @@ Generate list with `ls | sed 's/^/- /g'`
 - MekanismTools-1.12.2-9.8.3.390.jar
 - MemoryTester-0.4.2.jar
 - minecolonies-1.12.2-0.11.841-BETA-universal.jar
+- !mixinbooter-7.1.jar
 - MobGrindingUtils-0.3.13.jar
 - modnametooltip_1.12.2-1.10.1.jar
 - modtweaker-4.0.20.11.jar
@@ -185,7 +190,7 @@ Generate list with `ls | sed 's/^/- /g'`
 - Neat 1.4-17.jar
 - NetherPortalFix_1.12.1-5.3.17.jar
 - NoMobSpawningOnTrees-1.2.2-mc1.12.2.jar
-- NoNVFlash-1.12.2-1.2.0.3-universal.jar
+- normalasm-5.14-spongeforge-compat.jar
 - NoTemaStahp-1.12.2-1.0.3.jar
 - notenoughwands-1.12-1.8.1.jar
 - NuclearCraft-2.18z-1.12.2.jar
@@ -197,9 +202,12 @@ Generate list with `ls | sed 's/^/- /g'`
 - OreExcavation-1.4.150.jar
 - overloadedarmorbar-1.0.4g.jar
 - p455w0rdslib-1.12.2-2.3.161.jar
+- PackagedAstral-1.12.2-1.0.2.8.jar
+- PackagedAuto-1.12.2-1.0.9.33.jar
+- PackagedDraconic-1.12.2-1.0.0.6.jar
 - Pam's HarvestCraft 1.12.2zg.jar
 - Patchouli-1.0-23.6.jar
-- phosphor-1.12.2-0.2.6+build50-universal.jar
+- phosphor-1.12.2-0.2.9.2-SNAPSHOT-universal.jar
 - Placebo-1.12.2-1.6.1.jar
 - PlaneFix-1.12.2-1.0.0.jar
 - playersdropheads-1.12.x-1.1.0.jar
@@ -215,30 +223,30 @@ Generate list with `ls | sed 's/^/- /g'`
 - ProjectRed-1.12.2-4.9.4.120-lighting.jar
 - ProjectRed-1.12.2-4.9.4.120-mechanical.jar
 - ProjectRed-1.12.2-4.9.4.120-world.jar
+- ProportionalDestructionParticles-1.12.2-1.2.4.jar
 - Psi-r1.1-78.2.jar
 - Quark-r1.6-179.jar
-- questbook-3.1.1-1.12.jar
-- QuickLeafDecay-MC1.12.1-1.2.4.jar
 - randompatches-1.12.2-1.22.1.10.jar
 - RandomThings-MC1.12.2-4.2.7.4.jar
 - ReAuth-1.12-Forge-4.0.7.jar
 - RebornCore-1.12.2-3.19.5-universal.jar
 - RedstoneArsenal-1.12.2-2.6.6.1-universal.jar
 - RedstoneFlux-1.12-2.1.1.1-universal.jar
+- RenderLib-1.12.2-1.3.1.jar
 - ResourceLoader-MC1.12.1-1.5.3.jar
 - rftools-1.12-7.73.jar
 - rftoolsctrl-1.12-2.0.2.jar
 - rftoolsdim-1.12-5.71.jar
 - RoguelikeDungeons-1.12.2-1.8.0.jar
 - Roots-1.12.2-3.1.7.jar
+- RoughlyEnoughIDs-2.0.6.jar
 - rustic-1.1.7.jar
 - Scannable-MC1.12.2-1.6.3.26.jar
 - Schematica-1.12.2-1.8.0.169-universal.jar
+- Seared-Ladder-v1.1.2-mc1.12.2.jar
 - ShadowMC-1.12-3.8.0.jar
 - SimplyJetpacks2-1.12.2-2.2.20.0.jar
 - solcarrot-1.12.2-1.8.4.jar
-- StandardExpansion-3.4.173.jar
-- stg-1.12.2-1.2.3.jar
 - StorageDrawers-1.12.2-5.5.0.jar
 - StorageDrawersExtras-1.12-3.1.0.jar
 - Streams-1.12-0.4.8.jar
@@ -261,23 +269,21 @@ Generate list with `ls | sed 's/^/- /g'`
 - TinkerToolLeveling-1.12.2-1.1.0.jar
 - Tips-1.12.2-1.0.9.jar
 - TipTheScales-1.12.2-1.0.4.jar
-- Toast Control-1.12.2-1.8.1.jar
 - TombManyGraves-1.12-4.2.0.jar
 - topaddons-1.12.2-1.13.0.jar
 - torchmaster_1.12.2-1.8.5.0.jar
 - torohealth-1.12.2-11.jar
 - toughnessbar-2.4.jar
 - twilightforest-1.12.2-3.11.1021-universal.jar
 - UniDict-1.12.2-3.0.10.jar
+- UniversalTweaks-1.12.2-1.6.0.jar
 - UnlimitedChiselWorks-0.3.5.jar
-- unloader-1.2.0.jar
 - valkyrielib-1.12.2-2.0.20.1.jar
-- __VanillaFix-1.0.10-150_repack.jar
 - villager-market-1.12.2-1.0.2.jar
+- vintagefix-0.2.10.jar
 - WAIM-1.0.0.jar
 - WanionLib-1.12.2-2.91.jar
 - Waystones_1.12.2-4.1.0.jar
-- WirelessCraftingTerminal-1.12.2-3.12.97.jar
 - wizardry-0.11.1.jar
 - worleycaves-1.12.2-1.5.2.jar
 - WrapUp-1.12-1.1.3.jar