fujin/meatballcraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream 0.18.6.3 (e80fcdfd) into 0.18.5-hotfix2

Browse Source 
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:
Alexander
2026-08-18 12:19:29 +02:00
parent 67ba30e49b e80fcdfd55
commit 1fd1ae068c
3612 changed files with 61812 additions and 30986 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/ModularVoidMythical.zs
+18 -14
View File
@@ -1878,9 +1878,9 @@ mods.techreborn.vacuumFreezer.addRecipe(<materialpart:vibranium_alloy:ingot>, <m
mods.extendedcrafting.TableCrafting.addShaped(<contenttweaker:complex_crank_shaft>,
[[<ore:plateElectrumFlux>, <ore:plateIridium>, <ore:plateEnderium>, <ore:plateIridium>, <ore:plateElectrumFlux>],
[null, <tconstruct:arrow_shaft>.withTag({Material: "fierymetal"}), null, null, <tconstruct:arrow_shaft>.withTag({Material: "enderium_plustic"})],
[null, <tconstruct:arrow_shaft>.withTag({Material: "fierymetal"}), null, null, <tconstruct:arrow_shaft>.withTag({Material: "enderium"})],
[<ore:plateMagnalium>, <ore:plateMithrillium>, <materialpart:dreaded_steel:rod>, <ore:plateMithrillium>, <ore:plateMagnalium>],
[<tconstruct:arrow_shaft>.withTag({Material: "enderium_plustic"}), null, null, <tconstruct:arrow_shaft>.withTag({Material: "fierymetal"}), null],
[<tconstruct:arrow_shaft>.withTag({Material: "enderium"}), null, null, <tconstruct:arrow_shaft>.withTag({Material: "fierymetal"}), null],
[<ore:plateElectrumFlux>, <ore:plateIridium>, <ore:plateEnderium>, <ore:plateIridium>, <ore:plateElectrumFlux>]]);
mods.techreborn.assemblingMachine.addRecipe(<contenttweaker:high_strength_transmission>, <contenttweaker:complex_gearbox>, <contenttweaker:complex_crank_shaft>, 60, 512);
@@ -1896,8 +1896,8 @@ mith21.addItemOutput(<aoa3:borean_tokens>*64);
mith21.setChance(0.99);
mith21.addItemOutput(<aoa3:borean_tokens>*64);
mith21.setChance(0.99);
mith21.addItemOutput(<aoa3:coral_stone>*30);
mith21.setChance(0.5);
mith21.addItemOutput(<aoa3:coral_stone>*60);
mith21.setChance(0.9);
mith21.addItemOutput(<aoa3:bubble_berries>*30);
mith21.setChance(0.15);
mith21.addItemOutput(<aoa3:water_rune>*60);
@@ -2576,6 +2576,8 @@ mith24.addItemOutput(<aoa3:raw_charger_shank>*64);
mith24.setChance(0.99);
mith24.addItemOutput(<aoa3:raw_ursa_meat>*64);
mith24.setChance(0.99);
mith24.addItemOutput(<contenttweaker:calcite_gem>*64);
mith24.setChance(0.95);
mith24.addItemOutput(<contenttweaker:tier24_token>);
mith24.build();
@@ -2605,6 +2607,8 @@ mith25.addItemOutput(<contenttweaker:immortallis_garnet>);
mith25.setChance(0.25);
mith25.addItemOutput(<aoa3:fragmented_anima_stone>*64);
mith25.setChance(0.9);
mith25.addItemOutput(<contenttweaker:calcite_gem>*64);
mith25.setChance(0.9);
mith25.addItemOutput(<aoa3:dungeon_tokens>*64);
mith25.setChance(0.99);
mith25.addItemOutput(<aoa3:dungeon_tokens>*64);
@@ -2654,8 +2658,8 @@ mith26.addItemOutput(<aoa3:greckon_tokens>*64);
mith26.setChance(0.99);
mith26.addItemOutput(<aoa3:haunted_flower>*30);
mith26.setChance(0.45);
mith26.addItemOutput(<aoa3:ghoulasm>*10);
mith26.setChance(0.15);
mith26.addItemOutput(<aoa3:ghoulasm>*50);
mith26.setChance(0.55);
mith26.addItemOutput(<aoa3:distortion_rune>*60);
mith26.setChance(0.1);
mith26.addItemOutput(<aoa3:strike_rune>*60);
@@ -2820,7 +2824,9 @@ mith28.setChance(0.9);
mith28.addItemOutput(<divinerpg:honeysuckle>*64);
mith28.setChance(0.9);
mith28.addItemOutput(<contenttweaker:dream_brick>*64);
mith28.setChance(0.9);
mith28.setChance(0.99);
mith28.addItemOutput(<contenttweaker:dream_brick>*64);
mith28.setChance(0.99);
mith28.addItemOutput(<divinerpg:acid>*64);
mith28.setChance(0.9);
mith28.addItemOutput(<divinerpg:clean_pearls>*64);
@@ -3228,8 +3234,10 @@ mith29.addItemOutput(<aoa3:fragmented_anima_stone>*64);
mith29.setChance(0.7);
mith29.addItemOutput(<aoa3:fragmented_anima_stone>*64);
mith29.setChance(0.7);
mith29.addItemOutput(<contenttweaker:mother_pixon_soul>*10);
mith29.setChance(0.3);
mith29.addItemOutput(<contenttweaker:calcite_gem>*64);
mith29.setChance(0.95);
mith29.addItemOutput(<contenttweaker:mother_pixon_soul>*50);
mith29.setChance(0.8);
mith29.addItemOutput(<divinerpg:bluefire_stone>*40);
mith29.setChance(0.8);
mith29.addItemOutput(<divinerpg:divine_stone>*40);
@@ -3273,7 +3281,7 @@ mods.astralsorcery.Altar.addTraitAltarRecipe("MeatballCraft:shaped/internal/alta
<extendedcrafting:material:32>, <extendedcrafting:material:32>, <extendedcrafting:material:32>, <extendedcrafting:material:32>,<extendedcrafting:material:32>,
<extendedcrafting:material:32>,<divinerpg:divine_shards>, <divinerpg:divine_shards>,<divinerpg:divine_shards>, <divinerpg:divine_shards>,
//Outer Items, indices 25+
<ore:HighTierSingularity>, <ore:HighTierSingularity>, <ore:HighTierSingularity>, <ore:HighTierSingularity>
<ore:HighTierSingularity>, <extendedcrafting:singularity_custom:999>, <ore:HighTierSingularity>, <extendedcrafting:singularity_custom:999>, <ore:HighTierSingularity>, <extendedcrafting:singularity_custom:999>, <ore:HighTierSingularity>, <extendedcrafting:singularity_custom:999>
],
"astralsorcery.constellation.armara");
@@ -3302,10 +3310,6 @@ mods.extendedcrafting.CombinationCrafting.addRecipe(<contenttweaker:arbiterite_c
// mods.techreborn.implosionCompressor.addRecipe(<contenttweaker:defined_plate>, <minecraft:stone:0>, <contenttweaker:defined_ingot>, <contenttweaker:bloodmaster_block>*4, 60, 512);
mods.extendedcrafting.EnderCrafting.addShaped(<contenttweaker:defined_gear>,
[[<contenttweaker:shyre_crystal>, <contenttweaker:defined_plate>, <contenttweaker:shyre_crystal>],
[<contenttweaker:defined_plate>, <materialpart:chalcedony:ingot>, <contenttweaker:defined_plate>],
[<contenttweaker:shyre_crystal>, <contenttweaker:defined_plate>, <contenttweaker:shyre_crystal>]], 3);
recipes.addShaped(<contenttweaker:definer_core>,
[[<avaritia:resource:5>, <contenttweaker:defined_gear>, <avaritia:resource:5>],