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:
@@ -25,7 +25,7 @@ castcons4.addItemOutput(<contenttweaker:adamantium_ingot>);
|
||||
castcons4.build();
|
||||
|
||||
val castcons5 = RecipeBuilder.newBuilder("castcons5","seared_caster",20);
|
||||
castcons5.addFluidInput(<fluid:whisper_of_right_and_just_creation>*10);
|
||||
castcons5.addFluidInput(<fluid:whisper_of_right_and_just_creation>*600);
|
||||
castcons5.addItemInput(<contenttweaker:trinity_ingot>);
|
||||
castcons5.addItemOutput(<contenttweaker:trinity_bar>*2);
|
||||
castcons5.build();
|
||||
@@ -119,6 +119,8 @@ castcons18.build();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
val castcouch1 = RecipeBuilder.newBuilder("castcouch1","seared_caster",20);
|
||||
castcouch1.addFluidInput(<fluid:seared_grave_stone>*20);
|
||||
castcouch1.addItemInput(<tconstruct:cast>.withTag({PartType: "tconstruct:shard"}));
|
||||
@@ -158,7 +160,7 @@ val castcouch6 = RecipeBuilder.newBuilder("castcouch6","seared_caster",20);
|
||||
castcouch6.addFluidInput(<fluid:enderium>*288);
|
||||
castcouch6.addItemInput(<tconstruct:cast>.withTag({PartType: "tconstruct:arrow_shaft"}));
|
||||
castcouch6.setChance(0.0);
|
||||
castcouch6.addItemOutput(<tconstruct:arrow_shaft>.withTag({Material: "enderium_plustic"}));
|
||||
castcouch6.addItemOutput(<tconstruct:arrow_shaft>.withTag({Material: "enderium"}));
|
||||
castcouch6.build();
|
||||
|
||||
val castcouch7 = RecipeBuilder.newBuilder("castcouch7","seared_caster",20);
|
||||
@@ -582,7 +584,26 @@ castcouch66.setChance(0.0);
|
||||
castcouch66.addItemOutput(<contenttweaker:shard_of_humble_education>);
|
||||
castcouch66.build();
|
||||
|
||||
|
||||
val castcouch67 = RecipeBuilder.newBuilder("castcouch67","seared_caster",20);
|
||||
castcouch67.addFluidInput(<fluid:rarified_fluix_matter>*100000);
|
||||
castcouch67.addItemInput(<tconstruct:cast:0>);
|
||||
castcouch67.setChance(0.0);
|
||||
castcouch67.addItemOutput(<appliedenergistics2:material:12>*400);
|
||||
castcouch67.build();
|
||||
|
||||
val castcouch68 = RecipeBuilder.newBuilder("castcouch68","seared_caster",20);
|
||||
castcouch68.addFluidInput(<fluid:minted_fluix_matter>*200000);
|
||||
castcouch68.addItemInput(<tconstruct:cast:0>);
|
||||
castcouch68.setChance(0.0);
|
||||
castcouch68.addItemOutput(<appliedenergistics2:material:12>*1600);
|
||||
castcouch68.build();
|
||||
|
||||
val castcouch69 = RecipeBuilder.newBuilder("castcouch69","seared_caster",20);
|
||||
castcouch69.addFluidInput(<fluid:bas>*666);
|
||||
castcouch69.addItemInput(<tconstruct:cast_custom:2>);
|
||||
castcouch69.setChance(0.0);
|
||||
castcouch69.addItemOutput(<nuclearcraft:gem:5>*1);
|
||||
castcouch69.build();
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user