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/ModularMeteoricBefaller.zs
+40
View File
@@ -1,6 +1,13 @@
import mods.modularmachinery.RecipeBuilder;
recipes.addShaped(<contenttweaker:void_calling_fabrial>,
[[<contenttweaker:ascended_draconic_alloy>, <contenttweaker:elleipsinyum>, <contenttweaker:ascended_draconic_alloy>],
[<tconstruct:large_plate>.withTag({Material: "elecanium"}), <contenttweaker:lunar_star>, <tconstruct:large_plate>.withTag({Material: "elecanium"})],
[<contenttweaker:ascended_draconic_alloy>, <contenttweaker:elleipsinyum>, <contenttweaker:ascended_draconic_alloy>]]);
recipes.addShaped(<modularmachinery:blockmanaproviderinput>,
[[<botania:manaresource:8>, <modularmachinery:blockcasing:1>, <botania:manaresource:8>],
[<modularmachinery:blockcasing:1>, <botania:pool:3>, <modularmachinery:blockcasing:1>],
@@ -311,4 +318,37 @@ befaller12.addItemInput(<contenttweaker:tribody_fabrial>);
befaller12.addItemOutput(<contenttweaker:threefold_stellar_oscillator>*320);
befaller12.build();
val befaller13 = RecipeBuilder.newBuilder("befaller13","meteoric_befaller",100);
befaller13.addBiomeInput("aoa3:deeplands");
befaller13.addFluidInput(<fluid:meteoric_draconic_matter>*1000);
befaller13.addItemInput(<extrabees:honey_comb:46>);
befaller13.addItemOutput(<minecraft:lapis_ore>*1024);
befaller13.build();
val befaller14 = RecipeBuilder.newBuilder("befaller14","meteoric_befaller",100);
befaller14.addBiomeInput("aoa3:deeplands");
befaller14.addFluidInput(<fluid:meteoric_draconic_matter>*1000);
befaller14.addItemInput(<contenttweaker:demonic_ember>);
befaller14.addItemOutput(<railcraft:ore_magic:0>*32);
befaller14.addItemOutput(<tconstruct:ore:0>*32);
befaller14.addItemOutput(<tconstruct:ore:1>*32);
befaller14.build();
val befaller15 = RecipeBuilder.newBuilder("befaller15","meteoric_befaller",100);
befaller15.addBiomeInput("aoa3:deeplands");
befaller15.addFluidInput(<fluid:meteoric_draconic_matter>*1000);
befaller15.addItemInput(<contenttweaker:void_calling_fabrial>);
befaller15.addItemOutput(<environmentaltech:mica>*64);
befaller15.addItemOutput(<contenttweaker:litherite_ore>*100);
befaller15.addItemOutput(<contenttweaker:erodium_ore>*70);
befaller15.addItemOutput(<contenttweaker:kyronite_ore>*60);
befaller15.addItemOutput(<contenttweaker:pladium_ore>*50);
befaller15.addItemOutput(<contenttweaker:ionite_ore>*40);
befaller15.addItemOutput(<contenttweaker:aethium_ore>*30);
befaller15.addItemOutput(<contenttweaker:lonsdaleite_ore>*30);
befaller15.build();