Syncs the fork with sainagh/meatballcraft main. Pack version
prerelease-0.18.5-hotfix2 -> 0.18.6.3, mod count 367 -> 374.
Conflict resolutions (21 real conflicts, all taken from upstream after
verifying no hotfix2 content is lost):
- Runtime-generated caches (tconstruct_oredictcache.dat, ProjectE
mapping.cfg, AE2 items.csv/VersionChecker.cfg, teamreborn
configData.nbt, jei/worldSettings.cfg, splash.properties): upstream,
these regenerate on first load.
- config/extendedcrafting.cfg: upstream dedupes singularity 2060, which
duplicated 651 (divinerpg:divine_stone). ModularIceFire.zs repointed
to :651 to match.
- ToolTips*.zs: upstream reworked the tooltip set (+2093 lines). Of the
543 lines dropped, 542 were 0.18.5 base content upstream deliberately
rewrote; the 1 hotfix2 line (tardis_coral) exists upstream in extended
form.
- MythicProcessorTransfuser.zs: upstream split mythenrich* recipes into
a new scripts/MythicProcessorEnricher.zs against the new
mythic_processor_enricher machine. Both hotfix2-only recipes
(mythenrich23 infinity_fragment*4, mythenrich60 ogerite ->
primal_ogerite) are present there verbatim.
- ModularVoidBranches.zs: upstream rebalance (infinity 288->72,
resting_actualization 50->5); base matched ours, so not our change.
- AEGating.zs: upstream supersedes the hotfix2 block, using
cells:singularity_processor:2 and fixing a bug where our
import_essentia_interface recipe emitted export_essentia_interface.
hotfix2 config work (fugue.cfg, forge.cfg, forge_early.cfg,
ebwizardry.cfg) verified byte-identical after the merge.
NOT synced: mods/ jars. 35 version bumps, Botania -> Botania CEu,
BiblioCraft -> BiblioCraft Reshelved, CensoredASM dropped, 6 new mods.
The server will not start on these configs until the jars are updated.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Alexander
1fd1ae068c