Merge upstream 0.18.6.3 (e80fcdfd) into 0.18.5-hotfix2
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>
This commit is contained in:
@@ -506,4 +506,54 @@ bot49.addItemOutput(<divinerpg:wildwood_chunk>*256);
|
||||
bot49.addItemOutput(<divinerpg:apalachia_chunk>*256);
|
||||
bot49.addItemOutput(<divinerpg:skythern_chunk>*256);
|
||||
bot49.addItemOutput(<divinerpg:mortum_chunk>*256);
|
||||
bot49.build();
|
||||
bot49.build();
|
||||
|
||||
|
||||
recipes.addShaped(<contenttweaker:rod_of_valhalla>,
|
||||
[[null, <contenttweaker:bifrost_dust>, <contenttweaker:bifrost_dust>],
|
||||
[null, <botania:rainbowrod>, <contenttweaker:bifrost_dust>],
|
||||
[<tconstruct:tool_rod>.withTag({Material: "worthy"}), null, null]]);
|
||||
|
||||
|
||||
val bot50 = RecipeBuilder.newBuilder("bot50","gaia_altar",60);
|
||||
bot50.addEnergyPerTickInput(40000);
|
||||
bot50.addItemInput(<contenttweaker:rod_of_valhalla>);
|
||||
bot50.setChance(0.0);
|
||||
bot50.addItemInput(<botania:elfglass>*1024);
|
||||
bot50.addItemOutput(<botania:bifrostperm>*1024);
|
||||
bot50.build();
|
||||
|
||||
val bot51 = RecipeBuilder.newBuilder("bot51","gaia_altar",60);
|
||||
bot51.addEnergyPerTickInput(40000);
|
||||
bot51.addItemInput(<contenttweaker:rod_of_valhalla>);
|
||||
bot51.setChance(0.0);
|
||||
bot51.addItemInput(<botania:bifrostperm>*1024);
|
||||
bot51.addItemInput(<botania:dreamwood:1>*1024);
|
||||
bot51.addItemOutput(<botania:shimmerwoodplanks>*1024);
|
||||
bot51.build();
|
||||
|
||||
val bot52 = RecipeBuilder.newBuilder("bot52","gaia_altar",60);
|
||||
bot52.addEnergyPerTickInput(40000);
|
||||
bot52.addItemInput(<contenttweaker:rod_of_valhalla>);
|
||||
bot52.setChance(0.0);
|
||||
bot52.addItemInput(<botania:bifrostperm>*1024);
|
||||
bot52.addItemInput(<botania:livingrock:0>*1024);
|
||||
bot52.addItemOutput(<botania:shimmerrock>*1024);
|
||||
bot52.build();
|
||||
|
||||
|
||||
val bot53 = RecipeBuilder.newBuilder("bot53","gaia_altar",60);
|
||||
bot53.addEnergyPerTickInput(40000);
|
||||
bot53.addItemInput(<botania:rainbowrod>);
|
||||
bot53.setChance(0.0);
|
||||
bot53.addItemInput(<botania:shimmerrock>*320);
|
||||
bot53.addItemOutput(<botania:pool:3>*64);
|
||||
bot53.build();
|
||||
|
||||
val bot54 = RecipeBuilder.newBuilder("bot54","gaia_altar",60);
|
||||
bot54.addEnergyPerTickInput(40000);
|
||||
bot54.addItemInput(<contenttweaker:rod_of_valhalla>);
|
||||
bot54.setChance(0.0);
|
||||
bot54.addItemInput(<botania:shimmerrock>*3200);
|
||||
bot54.addItemOutput(<botania:pool:3>*640);
|
||||
bot54.build();
|
||||
Reference in New Issue
Block a user