diff --git a/config/ProjectE/custom_emc.json b/config/ProjectE/custom_emc.json index 0fdc6c15..996140f5 100644 --- a/config/ProjectE/custom_emc.json +++ b/config/ProjectE/custom_emc.json @@ -23295,6 +23295,10 @@ { "item": "contenttweaker:beekeper_archive|0", "emc": 100 + }, + { + "item": "contenttweaker:strange_stone_essence|0", + "emc": 0 } ] } \ No newline at end of file diff --git a/config/ProjectE/mapping.cfg b/config/ProjectE/mapping.cfg index 99f6402a..83b01524 100644 --- a/config/ProjectE/mapping.cfg +++ b/config/ProjectE/mapping.cfg @@ -248,7 +248,7 @@ mapperconfigurations { apicustomconversionmapper { allow { - # Allow Mod expequiv to add its 89179 Recipes to the EMC Calculation [default: true] + # Allow Mod expequiv to add its 89180 Recipes to the EMC Calculation [default: true] B:expequiv=true } diff --git a/config/cells.cfg b/config/cells.cfg index 47fcac24..bbb9244e 100644 --- a/config/cells.cfg +++ b/config/cells.cfg @@ -31,6 +31,9 @@ enabled_cells { ########################################################################################################## general { + # Number of upgrade slots for compacting cells (1-16) + I:compactingCellUpgradeSlots=4 + # Maximum essentia types for configurable essentia storage cells (1-16384) I:configurableCellEssentiaMaxTypes=63 @@ -44,12 +47,24 @@ general { I:configurableCellItemMaxTypes=63 I:configurableCellMaxTypes=63 + # Number of upgrade slots for configurable cells (1-16) + I:configurableCellUpgradeSlots=4 + # Enable NBT size computation and display in cell tooltips. Disable for performance. B:enableNbtSizeTooltip=true + # Number of upgrade slots for hyper-density compacting cells (1-16) + I:hdCompactingCellUpgradeSlots=4 + + # Number of upgrade slots for hyper-density fluid cells (1-16) + I:hdFluidCellUpgradeSlots=4 + # Maximum item types for hyper-density fluid storage cells (1-16384) I:hdFluidMaxTypes=63 + # Number of upgrade slots for hyper-density item cells (1-16) + I:hdItemCellUpgradeSlots=4 + # Maximum item types for hyper-density item storage cells (1-16384) I:hdItemMaxTypes=63 diff --git a/config/defaultoptions/keybindings.txt b/config/defaultoptions/keybindings.txt index ee74f0c5..164d8ca3 100644 --- a/config/defaultoptions/keybindings.txt +++ b/config/defaultoptions/keybindings.txt @@ -248,11 +248,11 @@ key_Rotate Vehicle Left:0:NONE key_Move Vehicle Up:0:NONE key_Move Vehicle Down:0:NONE key_bogosort.key.move_all_same:-100:ALT -key_bogosort.key.move_all:-100:NONE +key_bogosort.key.move_all:0:NONE key_bogosort.key.move_single:-100:CONTROL key_bogosort.key.move_single_empty:-99:CONTROL -key_bogosort.key.throw_all_same:16:ALT -key_bogosort.key.throw_all:16:NONE +key_bogosort.key.throw_all_same:0:NONE +key_bogosort.key.throw_all:0:NONE key_bogosort.key.sort_config:49:NONE key_bogosort.key.sort:-98:NONE key_bogosort.key.lock_slot:19:CONTROL diff --git a/config/ichunutil.cfg b/config/ichunutil.cfg index d55465dd..d63dbb9e 100644 --- a/config/ichunutil.cfg +++ b/config/ichunutil.cfg @@ -70,7 +70,7 @@ module { I:versionNotificationTypes=0 # Don't change this. - I:versionSave=13 + I:versionSave=14 } } diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg index 39d243fd..c9ffe239 100644 --- a/config/jei/worldSettings.cfg +++ b/config/jei/worldSettings.cfg @@ -483,10 +483,7 @@ world-288993849 { world-310143583 { - # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=false - - # Give items instead of showing the recipe. B:cheatItemsEnabled=false # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) @@ -494,7 +491,7 @@ world-310143583 { # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false - S:filterText=stormli + S:filterText=dragons # Show the list of ingredients next to open GUIs. B:overlayEnabled=true diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat.json index 720ae8ae..5ff3d9c5 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_ahkrast_korvalain.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_ahkrast_korvalain.json index a963400f..6c9e6699 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_ahkrast_korvalain.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_ahkrast_korvalain.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_donaeth_rusen.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_donaeth_rusen.json index c0c817df..eef00fb7 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_donaeth_rusen.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_donaeth_rusen.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_emurlahn.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_emurlahn.json index 10c50b73..b1d35fc7 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_emurlahn.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_emurlahn.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_galain.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_galain.json index 6260c077..d54fc1ad 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_galain.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_galain.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_thyrllan.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_thyrllan.json index bdc8b1bb..56f6daba 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_thyrllan.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_kurald_thyrllan.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_omtose_phellack.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_omtose_phellack.json index d3764388..6fa69f20 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_omtose_phellack.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_omtose_phellack.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_starvald_demelain.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_starvald_demelain.json index 067498e7..81319382 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_starvald_demelain.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_starvald_demelain.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_tellan.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_tellan.json index 73d74e95..3d4ce01b 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_tellan.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_tellan.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_thel.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_thel.json index 75b64c7d..642ac368 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_thel.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_thel.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/modularmachinery/machinery/recursive_brain_in_a_vat_verdith_anath.json b/config/modularmachinery/machinery/recursive_brain_in_a_vat_verdith_anath.json index ff3787f0..60895ec5 100644 --- a/config/modularmachinery/machinery/recursive_brain_in_a_vat_verdith_anath.json +++ b/config/modularmachinery/machinery/recursive_brain_in_a_vat_verdith_anath.json @@ -1705,7 +1705,7 @@ "y": 0, "z": 14, "elements": [ - "modularmachinery:blockmefluidoutputbus" + "generalized_output_fluid" ] }, { diff --git a/config/splash.properties b/config/splash.properties index 80f6065f..efcbdb02 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Fri Mar 13 16:01:16 CDT 2026 +#Sat Mar 14 18:32:02 CDT 2026 background=0xBFBFBF memoryGood=0x00091A font=0x960826 @@ -9,9 +9,9 @@ memoryLow=0x00091A rotate=false memoryWarn=0x00091A showMemory=true -enabled=true bar=0x00091A +enabled=true resourcePackPath=resources logoOffset=0 forgeTexture=fml\:textures/gui/forge.png -fontTexture=textures/font/ascii.png \ No newline at end of file +fontTexture=textures/font/ascii.png diff --git a/config/teamreborn/configData.nbt b/config/teamreborn/configData.nbt index 22296f3f..7f258332 100644 Binary files a/config/teamreborn/configData.nbt and b/config/teamreborn/configData.nbt differ diff --git a/oresources/contenttweaker/lang/en_us.lang b/oresources/contenttweaker/lang/en_us.lang index a3c48c94..9ee7034f 100644 --- a/oresources/contenttweaker/lang/en_us.lang +++ b/oresources/contenttweaker/lang/en_us.lang @@ -4154,5 +4154,6 @@ fluid.allure_of_the_void=Allure of the Void fluid.gluttonous_lymph=Gluttonous Lymph fluid.blood_infused_glowstone=Blood Infused Glowstone fluid.tangible_aqua=Tangible Aqua +fluid.distillate_of_levity=Distillate of Levity diff --git a/oresources/contenttweaker/lang/zh_cn.lang b/oresources/contenttweaker/lang/zh_cn.lang index 8cfb1c27..ed37cd2a 100644 --- a/oresources/contenttweaker/lang/zh_cn.lang +++ b/oresources/contenttweaker/lang/zh_cn.lang @@ -4154,6 +4154,7 @@ fluid.allure_of_the_void=虚空诱饵 fluid.gluttonous_lymph=暴食淋巴液 fluid.blood_infused_glowstone=注血荧石 fluid.tangible_aqua=实形Aqua +fluid.distillate_of_levity=轻盈之精粹 diff --git a/resources/contenttweaker/blockstates/distillate_of_levity.json b/resources/contenttweaker/blockstates/distillate_of_levity.json new file mode 100644 index 00000000..4d8ca3b0 --- /dev/null +++ b/resources/contenttweaker/blockstates/distillate_of_levity.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "forge:fluid", + "custom": { + "fluid": "distillate_of_levity" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index a3c48c94..9ee7034f 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -4154,5 +4154,6 @@ fluid.allure_of_the_void=Allure of the Void fluid.gluttonous_lymph=Gluttonous Lymph fluid.blood_infused_glowstone=Blood Infused Glowstone fluid.tangible_aqua=Tangible Aqua +fluid.distillate_of_levity=Distillate of Levity diff --git a/scripts/AEGating.zs b/scripts/AEGating.zs index dedb53a0..7aefefa6 100644 --- a/scripts/AEGating.zs +++ b/scripts/AEGating.zs @@ -917,7 +917,7 @@ recipes.addShaped(, recipes.removeShaped(); -recipes.addShaped(, +recipes.addShaped(, [[, , ], [, , ], [, , ]]); @@ -975,3 +975,48 @@ recipes.addShaped(, [, , ], [, , ]]); + +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); +recipes.addShapeless(, +[, ]); + + + + + + + + + + diff --git a/scripts/ArbiterMachinery.zs b/scripts/ArbiterMachinery.zs index 1c0021f4..5587c6f7 100644 --- a/scripts/ArbiterMachinery.zs +++ b/scripts/ArbiterMachinery.zs @@ -810,6 +810,13 @@ recipes.addShaped(.withTag({FluidName: "essence_of_sane_thou [makeVisCrystal( * 1), .withTag({FluidName: "vapor_of_levity", Amount: 1000}), makeVisCrystal( * 1)], [, .withTag({brewKey: "warpWard"}), ]]); +recipes.addShaped(.withTag({tank: {FluidName: "essence_of_sane_thoughts", Amount: 16000}}), +[[, .withTag({display: {Name: "ᚽᛠᛇᛒᚽᛃᛒᚶᚣᚽᚤᛠᚽᚥᛊ",Lore:["§d§o真名§r"]}}), ], +[makeVisCrystal( * 1), .withTag({tank: {FluidName: "distillate_of_levity", Amount: 16000}}), makeVisCrystal( * 1)], +[, .withTag({brewKey: "warpWard"}), ]]); + + + recipes.addShaped(*4, [[, , ], [, , ], @@ -1865,7 +1872,7 @@ creatdonaeth7.addFluidInput(*409600); creatdonaeth7.addItemInput(.withTag({display: {Lore: ["§d§M模式 7§r"]}})); creatdonaeth7.setChance(0.0); creatdonaeth7.addItemInput(*4096); -creatdonaeth7.addItemInput(*14096024); +creatdonaeth7.addItemInput(*4096); creatdonaeth7.addFluidOutput(*1000000); creatdonaeth7.build(); diff --git a/scripts/BotaniaGating.zs b/scripts/BotaniaGating.zs index 6286cf1e..6e526a22 100644 --- a/scripts/BotaniaGating.zs +++ b/scripts/BotaniaGating.zs @@ -297,37 +297,37 @@ mods.botania.RuneAltar.addRecipe(*8192, [, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*2, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*4, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*6, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*10, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*16, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*24, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*36, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*44, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*66, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*128, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*256, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*512, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*1024, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*2048, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*4096, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*8192, -[, , , , , ], 50); +[, , , , , ], 50); mods.botania.RuneAltar.addRecipe(*2, diff --git a/scripts/CustomAbyCrystallizer.zs b/scripts/CustomAbyCrystallizer.zs index 129baf1c..2223d070 100644 --- a/scripts/CustomAbyCrystallizer.zs +++ b/scripts/CustomAbyCrystallizer.zs @@ -22,7 +22,7 @@ mods.abyssalcraft.Crystallizer.addCrystallization(, * 64, * 64, 0.5); -mods.abyssalcraft.Crystallizer.addCrystallization(, * 64, * 64, 0.5); +mods.abyssalcraft.Crystallizer.addCrystallization(, * 64, * 64, 0.5); mods.abyssalcraft.Crystallizer.addCrystallization(, * 64, * 64, 0.5); diff --git a/scripts/CustomBees2.zs b/scripts/CustomBees2.zs index 45115f30..c09d5d94 100644 --- a/scripts/CustomBees2.zs +++ b/scripts/CustomBees2.zs @@ -135,3 +135,30 @@ recipes.addShaped(, [, , ], [, , ]]); + + +recipes.addShaped(.withTag({tier: 4, totalKillCount: 1300, dataCount: 0}), +[[, , ], +[, , ], +[, , ]]); + +recipes.addShaped(.withTag({tier: 4, totalKillCount: 1300, dataCount: 0}), +[[, , ], +[, , ], +[, , ]]); + +recipes.addShaped(.withTag({tier: 4, totalKillCount: 1300, dataCount: 0}), +[[, , ], +[, , ], +[, , ]]); + +recipes.addShaped(.withTag({tier: 4, totalKillCount: 1300, dataCount: 0}), +[[, , ], +[, , ], +[, , ]]); + +recipes.addShaped(.withTag({tier: 4, totalKillCount: 1300, dataCount: 0}), +[[, , ], +[, , ], +[, , ]]); + diff --git a/scripts/CustomFluids.zs b/scripts/CustomFluids.zs index d59bb99d..d3ed38e4 100644 --- a/scripts/CustomFluids.zs +++ b/scripts/CustomFluids.zs @@ -1316,6 +1316,8 @@ breathofactualization.register(); +var distillateoflevity = VanillaFactory.createFluid("distillate_of_levity", Color.fromHex("82a88c")); +distillateoflevity.register(); diff --git a/scripts/MasterSpells.zs b/scripts/MasterSpells.zs index edd0f064..5bd11539 100644 --- a/scripts/MasterSpells.zs +++ b/scripts/MasterSpells.zs @@ -232,7 +232,7 @@ masterspelldreadia.itemRightClick = function(stack, world, player, hand) { Commands.call("summon Item ~ ~10 ~ {Item:{id:\"contenttweaker:bloodmaster_metal_chest\",Count:1b}}", player, world, false, true); Commands.call("summon Item ~ ~10 ~ {Item:{id:\"contenttweaker:bloodmaster_metal_feet\",Count:1b}}", player, world, false, true); Commands.call("summon Item ~ ~10 ~ {Item:{id:\"contenttweaker:bloodmaster_metal_legs\",Count:1b}}", player, world, false, true); - Commands.call("summon abyssalcraft:dreaded_abyssalnite_golem ~ ~3 ~ {Attributes:[{Name:generic.maxHealth, Base:10000.0},{Name:generic.attackDamage, Base:300.0}],Health:10000f}", player, world, false, true); + Commands.call("summon abyssalcraft:dreadgolem ~ ~3 ~ {Attributes:[{Name:generic.maxHealth, Base:10000.0},{Name:generic.attackDamage, Base:300.0}],Health:10000f}", player, world, false, true); return "Pass"; }; masterspelldreadia.register(); diff --git a/scripts/ModularCasting.zs b/scripts/ModularCasting.zs index 694ca734..25f85cfa 100644 --- a/scripts/ModularCasting.zs +++ b/scripts/ModularCasting.zs @@ -364,7 +364,7 @@ val castcouch38 = RecipeBuilder.newBuilder("castcouch38","seared_caster",20); castcouch38.addFluidInput(*72); castcouch38.addItemInput(.withTag({PartType: "tconstruct:shard"})); castcouch38.setChance(0.0); -castcouch38.addItemOutput(.withTag({Material: "barserk_steel"})); +castcouch38.addItemOutput(.withTag({Material: "berserk_steel"})); castcouch38.build(); val castcouch39 = RecipeBuilder.newBuilder("castcouch39","seared_caster",20); diff --git a/scripts/ModularStillPot.zs b/scripts/ModularStillPot.zs index e65f383b..9cccd449 100644 --- a/scripts/ModularStillPot.zs +++ b/scripts/ModularStillPot.zs @@ -351,6 +351,7 @@ mods.nuclearcraft.extractor.addRecipe([, , , *1000]); mods.nuclearcraft.extractor.addRecipe([, , *1000]); mods.nuclearcraft.extractor.addRecipe([, , *1000]); +mods.nuclearcraft.extractor.addRecipe([, , *1000]); @@ -364,6 +365,7 @@ mods.nuclearcraft.extractor.addRecipe([, , , *1000]); mods.nuclearcraft.extractor.addRecipe([, , *1000]); mods.nuclearcraft.extractor.addRecipe([, , *1000]); +mods.nuclearcraft.extractor.addRecipe([, , *1000]); @@ -385,6 +387,7 @@ mods.nuclearcraft.infuser.addRecipe([, , *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); @@ -398,6 +401,7 @@ mods.nuclearcraft.infuser.addRecipe([, , *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); +mods.nuclearcraft.infuser.addRecipe([, *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); mods.nuclearcraft.infuser.addRecipe([, *1000, ]); diff --git a/scripts/MythicProcessorAssemblingMachine.zs b/scripts/MythicProcessorAssemblingMachine.zs index ea8e60bf..4f8e68d4 100644 --- a/scripts/MythicProcessorAssemblingMachine.zs +++ b/scripts/MythicProcessorAssemblingMachine.zs @@ -503,7 +503,7 @@ mythassmac65.build(); val mythassmac66 = RecipeBuilder.newBuilder("mythassmac66","mythic_processor_assembling_machine",2); mythassmac66.addEnergyPerTickInput(40000); -mythassmac66.addItemInput(*4); +mythassmac66.addItemInput(*4); mythassmac66.addItemInput(*48); mythassmac66.addItemOutput(*4); mythassmac66.build(); diff --git a/scripts/MythicProcessorTransfuser.zs b/scripts/MythicProcessorTransfuser.zs index 059f3d44..a2da5a55 100644 --- a/scripts/MythicProcessorTransfuser.zs +++ b/scripts/MythicProcessorTransfuser.zs @@ -170,7 +170,7 @@ mythinfus24.build(); val mythinfus25 = RecipeBuilder.newBuilder("mythinfus25","mythic_processor_infuser",2); mythinfus25.addEnergyPerTickInput(1000000); -mythinfus25.addFluidInput(*100); +mythinfus25.addFluidInput(*1); mythinfus25.addItemInput(); mythinfus25.addItemOutput(*32); mythinfus25.build(); @@ -999,8 +999,209 @@ mythinfus118.addItemOutput(.withTag({Fluid: {FluidName: mythinfus118.build(); +val mythinfus119 = RecipeBuilder.newBuilder("mythinfus119","mythic_processor_infuser",2); +mythinfus119.addEnergyPerTickInput(1000000); +mythinfus119.addFluidInput(*1000); +mythinfus119.addItemInput(*1); +mythinfus119.addItemOutput(); +mythinfus119.build(); + +val mythinfus120 = RecipeBuilder.newBuilder("mythinfus120","mythic_processor_infuser",2); +mythinfus120.addEnergyPerTickInput(1000000); +mythinfus120.addFluidInput(*1000); +mythinfus120.addItemInput(*1); +mythinfus120.addItemOutput(); +mythinfus120.build(); + +val mythinfus121 = RecipeBuilder.newBuilder("mythinfus121","mythic_processor_infuser",2); +mythinfus121.addEnergyPerTickInput(1000000); +mythinfus121.addFluidInput(*1000); +mythinfus121.addItemInput(*1); +mythinfus121.addItemOutput(); +mythinfus121.build(); + +val mythinfus122 = RecipeBuilder.newBuilder("mythinfus122","mythic_processor_infuser",2); +mythinfus122.addEnergyPerTickInput(1000000); +mythinfus122.addFluidInput(*1000); +mythinfus122.addItemInput(*1); +mythinfus122.addItemOutput(); +mythinfus122.build(); + +val mythinfus123 = RecipeBuilder.newBuilder("mythinfus123","mythic_processor_infuser",2); +mythinfus123.addEnergyPerTickInput(1000000); +mythinfus123.addFluidInput(*1000); +mythinfus123.addItemInput(*1); +mythinfus123.addItemOutput(); +mythinfus123.build(); + +val mythinfus124 = RecipeBuilder.newBuilder("mythinfus124","mythic_processor_infuser",2); +mythinfus124.addEnergyPerTickInput(1000000); +mythinfus124.addFluidInput(*1000); +mythinfus124.addItemInput(*1); +mythinfus124.addItemOutput(); +mythinfus124.build(); + +val mythinfus125 = RecipeBuilder.newBuilder("mythinfus125","mythic_processor_infuser",2); +mythinfus125.addEnergyPerTickInput(1000000); +mythinfus125.addFluidInput(*1000); +mythinfus125.addItemInput(*1); +mythinfus125.addItemOutput(); +mythinfus125.build(); + +val mythinfus126 = RecipeBuilder.newBuilder("mythinfus126","mythic_processor_infuser",2); +mythinfus126.addEnergyPerTickInput(1000000); +mythinfus126.addFluidInput(*1000); +mythinfus126.addItemInput(*1); +mythinfus126.addItemOutput(); +mythinfus126.build(); + +val mythinfus127 = RecipeBuilder.newBuilder("mythinfus127","mythic_processor_infuser",2); +mythinfus127.addEnergyPerTickInput(1000000); +mythinfus127.addFluidInput(*1000); +mythinfus127.addItemInput(*1); +mythinfus127.addItemOutput(); +mythinfus127.build(); + +val mythinfus128 = RecipeBuilder.newBuilder("mythinfus128","mythic_processor_infuser",2); +mythinfus128.addEnergyPerTickInput(1000000); +mythinfus128.addFluidInput(*1000); +mythinfus128.addItemInput(*1); +mythinfus128.addItemOutput(); +mythinfus128.build(); + +val mythinfus129 = RecipeBuilder.newBuilder("mythinfus129","mythic_processor_infuser",2); +mythinfus129.addEnergyPerTickInput(1000000); +mythinfus129.addFluidInput(*1000); +mythinfus129.addItemInput(*1); +mythinfus129.addItemOutput(); +mythinfus129.build(); + +val mythinfus130 = RecipeBuilder.newBuilder("mythinfus130","mythic_processor_infuser",2); +mythinfus130.addEnergyPerTickInput(1000000); +mythinfus130.addFluidInput(*1000); +mythinfus130.addItemInput(*1); +mythinfus130.addItemOutput(); +mythinfus130.build(); + +val mythinfus131 = RecipeBuilder.newBuilder("mythinfus131","mythic_processor_infuser",2); +mythinfus131.addEnergyPerTickInput(1000000); +mythinfus131.addFluidInput(*1000); +mythinfus131.addItemInput(*1); +mythinfus131.addItemOutput(); +mythinfus131.build(); + +val mythinfus132 = RecipeBuilder.newBuilder("mythinfus132","mythic_processor_infuser",2); +mythinfus132.addEnergyPerTickInput(1000000); +mythinfus132.addFluidInput(*1000); +mythinfus132.addItemInput(*1); +mythinfus132.addItemOutput(); +mythinfus132.build(); + +val mythinfus133 = RecipeBuilder.newBuilder("mythinfus133","mythic_processor_infuser",2); +mythinfus133.addEnergyPerTickInput(1000000); +mythinfus133.addFluidInput(*1000); +mythinfus133.addItemInput(*1); +mythinfus133.addItemOutput(); +mythinfus133.build(); + +val mythinfus134 = RecipeBuilder.newBuilder("mythinfus134","mythic_processor_infuser",2); +mythinfus134.addEnergyPerTickInput(1000000); +mythinfus134.addFluidInput(*1000); +mythinfus134.addItemInput(*1); +mythinfus134.addItemOutput(); +mythinfus134.build(); + +val mythinfus135 = RecipeBuilder.newBuilder("mythinfus135","mythic_processor_infuser",2); +mythinfus135.addEnergyPerTickInput(1000000); +mythinfus135.addFluidInput(*1000); +mythinfus135.addItemInput(*1); +mythinfus135.addItemOutput(); +mythinfus135.build(); +val mythinfus136 = RecipeBuilder.newBuilder("mythinfus136","mythic_processor_infuser",2); +mythinfus136.addEnergyPerTickInput(1000000); +mythinfus136.addFluidInput(*1000); +mythinfus136.addItemInput(*1); +mythinfus136.addItemOutput(); +mythinfus136.build(); + +val mythinfus137 = RecipeBuilder.newBuilder("mythinfus137","mythic_processor_infuser",2); +mythinfus137.addEnergyPerTickInput(1000000); +mythinfus137.addFluidInput(*1000); +mythinfus137.addItemInput(*1); +mythinfus137.addItemOutput(); +mythinfus137.build(); + +val mythinfus138 = RecipeBuilder.newBuilder("mythinfus138","mythic_processor_infuser",2); +mythinfus138.addEnergyPerTickInput(1000000); +mythinfus138.addFluidInput(*1000); +mythinfus138.addItemInput(*1); +mythinfus138.addItemOutput(); +mythinfus138.build(); + +val mythinfus139 = RecipeBuilder.newBuilder("mythinfus139","mythic_processor_infuser",2); +mythinfus139.addEnergyPerTickInput(1000000); +mythinfus139.addFluidInput(*1000); +mythinfus139.addItemInput(*1); +mythinfus139.addItemOutput(); +mythinfus139.build(); + +val mythinfus140 = RecipeBuilder.newBuilder("mythinfus140","mythic_processor_infuser",2); +mythinfus140.addEnergyPerTickInput(1000000); +mythinfus140.addFluidInput(*1000); +mythinfus140.addItemInput(*1); +mythinfus140.addItemOutput(); +mythinfus140.build(); + +val mythinfus141 = RecipeBuilder.newBuilder("mythinfus141","mythic_processor_infuser",2); +mythinfus141.addEnergyPerTickInput(1000000); +mythinfus141.addFluidInput(*1000); +mythinfus141.addItemInput(*1); +mythinfus141.addItemOutput(); +mythinfus141.build(); + +val mythinfus142 = RecipeBuilder.newBuilder("mythinfus142","mythic_processor_infuser",2); +mythinfus142.addEnergyPerTickInput(1000000); +mythinfus142.addFluidInput(*1000); +mythinfus142.addItemInput(*1); +mythinfus142.addItemOutput(); +mythinfus142.build(); + +val mythinfus143 = RecipeBuilder.newBuilder("mythinfus143","mythic_processor_infuser",2); +mythinfus143.addEnergyPerTickInput(1000000); +mythinfus143.addFluidInput(*1000); +mythinfus143.addItemInput(*1); +mythinfus143.addItemOutput(); +mythinfus143.build(); + +val mythinfus144 = RecipeBuilder.newBuilder("mythinfus144","mythic_processor_infuser",2); +mythinfus144.addEnergyPerTickInput(1000000); +mythinfus144.addFluidInput(*1000); +mythinfus144.addItemInput(*1); +mythinfus144.addItemOutput(); +mythinfus144.build(); + +val mythinfus145 = RecipeBuilder.newBuilder("mythinfus145","mythic_processor_infuser",2); +mythinfus145.addEnergyPerTickInput(1000000); +mythinfus145.addFluidInput(*1000); +mythinfus145.addItemInput(*1); +mythinfus145.addItemOutput(); +mythinfus145.build(); + +val mythinfus146 = RecipeBuilder.newBuilder("mythinfus146","mythic_processor_infuser",2); +mythinfus146.addEnergyPerTickInput(1000000); +mythinfus146.addFluidInput(*1000); +mythinfus146.addItemInput(*1); +mythinfus146.addItemOutput(); +mythinfus146.build(); + +val mythinfus147 = RecipeBuilder.newBuilder("mythinfus147","mythic_processor_infuser",2); +mythinfus147.addEnergyPerTickInput(1000000); +mythinfus147.addFluidInput(*16000); +mythinfus147.addItemInput(); +mythinfus147.addItemOutput(.withTag({tank: {FluidName: "distillate_of_levity", Amount: 16000}})); +mythinfus147.build(); @@ -1259,6 +1460,232 @@ mythextrac34.addFluidOutput(*1000); mythextrac34.build(); +val mythextrac35 = RecipeBuilder.newBuilder("mythextrac35","mythic_processor_infuser",2); +mythextrac35.addEnergyPerTickInput(1000000); +mythextrac35.addItemInput(); +mythextrac35.addItemOutput(); +mythextrac35.addFluidOutput(*1000); +mythextrac35.build(); + +val mythextrac36 = RecipeBuilder.newBuilder("mythextrac36","mythic_processor_infuser",2); +mythextrac36.addEnergyPerTickInput(1000000); +mythextrac36.addItemInput(); +mythextrac36.addItemOutput(); +mythextrac36.addFluidOutput(*1000); +mythextrac36.build(); + +val mythextrac37 = RecipeBuilder.newBuilder("mythextrac37","mythic_processor_infuser",2); +mythextrac37.addEnergyPerTickInput(1000000); +mythextrac37.addItemInput(); +mythextrac37.addItemOutput(); +mythextrac37.addFluidOutput(*1000); +mythextrac37.build(); + +val mythextrac38 = RecipeBuilder.newBuilder("mythextrac38","mythic_processor_infuser",2); +mythextrac38.addEnergyPerTickInput(1000000); +mythextrac38.addItemInput(); +mythextrac38.addItemOutput(); +mythextrac38.addFluidOutput(*1000); +mythextrac38.build(); + +val mythextrac39 = RecipeBuilder.newBuilder("mythextrac39","mythic_processor_infuser",2); +mythextrac39.addEnergyPerTickInput(1000000); +mythextrac39.addItemInput(); +mythextrac39.addItemOutput(); +mythextrac39.addFluidOutput(*1000); +mythextrac39.build(); + +val mythextrac40 = RecipeBuilder.newBuilder("mythextrac40","mythic_processor_infuser",2); +mythextrac40.addEnergyPerTickInput(1000000); +mythextrac40.addItemInput(); +mythextrac40.addItemOutput(); +mythextrac40.addFluidOutput(*1000); +mythextrac40.build(); + +val mythextrac41 = RecipeBuilder.newBuilder("mythextrac41","mythic_processor_infuser",2); +mythextrac41.addEnergyPerTickInput(1000000); +mythextrac41.addItemInput(); +mythextrac41.addItemOutput(); +mythextrac41.addFluidOutput(*1000); +mythextrac41.build(); + +val mythextrac42 = RecipeBuilder.newBuilder("mythextrac42","mythic_processor_infuser",2); +mythextrac42.addEnergyPerTickInput(1000000); +mythextrac42.addItemInput(); +mythextrac42.addItemOutput(); +mythextrac42.addFluidOutput(*1000); +mythextrac42.build(); + +val mythextrac43 = RecipeBuilder.newBuilder("mythextrac43","mythic_processor_infuser",2); +mythextrac43.addEnergyPerTickInput(1000000); +mythextrac43.addItemInput(); +mythextrac43.addItemOutput(); +mythextrac43.addFluidOutput(*1000); +mythextrac43.build(); + +val mythextrac44 = RecipeBuilder.newBuilder("mythextrac44","mythic_processor_infuser",2); +mythextrac44.addEnergyPerTickInput(1000000); +mythextrac44.addItemInput(); +mythextrac44.addItemOutput(); +mythextrac44.addFluidOutput(*1000); +mythextrac44.build(); + +val mythextrac45 = RecipeBuilder.newBuilder("mythextrac45","mythic_processor_infuser",2); +mythextrac45.addEnergyPerTickInput(1000000); +mythextrac45.addItemInput(); +mythextrac45.addItemOutput(); +mythextrac45.addFluidOutput(*1000); +mythextrac45.build(); + +val mythextrac46 = RecipeBuilder.newBuilder("mythextrac46","mythic_processor_infuser",2); +mythextrac46.addEnergyPerTickInput(1000000); +mythextrac46.addItemInput(); +mythextrac46.addItemOutput(); +mythextrac46.addFluidOutput(*1000); +mythextrac46.build(); + +val mythextrac47 = RecipeBuilder.newBuilder("mythextrac47","mythic_processor_infuser",2); +mythextrac47.addEnergyPerTickInput(1000000); +mythextrac47.addItemInput(); +mythextrac47.addItemOutput(); +mythextrac47.addFluidOutput(*1000); +mythextrac47.build(); + +val mythextrac48 = RecipeBuilder.newBuilder("mythextrac48","mythic_processor_infuser",2); +mythextrac48.addEnergyPerTickInput(1000000); +mythextrac48.addItemInput(); +mythextrac48.addItemOutput(); +mythextrac48.addFluidOutput(*1000); +mythextrac48.build(); + +val mythextrac49 = RecipeBuilder.newBuilder("mythextrac49","mythic_processor_infuser",2); +mythextrac49.addEnergyPerTickInput(1000000); +mythextrac49.addItemInput(); +mythextrac49.addItemOutput(); +mythextrac49.addFluidOutput(*1000); +mythextrac49.build(); + +val mythextrac50 = RecipeBuilder.newBuilder("mythextrac50","mythic_processor_infuser",2); +mythextrac50.addEnergyPerTickInput(1000000); +mythextrac50.addItemInput(); +mythextrac50.addItemOutput(); +mythextrac50.addFluidOutput(*1000); +mythextrac50.build(); + +val mythextrac51 = RecipeBuilder.newBuilder("mythextrac51","mythic_processor_infuser",2); +mythextrac51.addEnergyPerTickInput(1000000); +mythextrac51.addItemInput(); +mythextrac51.addItemOutput(); +mythextrac51.addFluidOutput(*1000); +mythextrac51.build(); + +val mythextrac52 = RecipeBuilder.newBuilder("mythextrac52","mythic_processor_infuser",2); +mythextrac52.addEnergyPerTickInput(1000000); +mythextrac52.addItemInput(); +mythextrac52.addItemOutput(); +mythextrac52.addFluidOutput(*1000); +mythextrac52.build(); + +val mythextrac53 = RecipeBuilder.newBuilder("mythextrac53","mythic_processor_infuser",2); +mythextrac53.addEnergyPerTickInput(1000000); +mythextrac53.addItemInput(); +mythextrac53.addItemOutput(); +mythextrac53.addFluidOutput(*1000); +mythextrac53.build(); + +val mythextrac54 = RecipeBuilder.newBuilder("mythextrac54","mythic_processor_infuser",2); +mythextrac54.addEnergyPerTickInput(1000000); +mythextrac54.addItemInput(); +mythextrac54.addItemOutput(); +mythextrac54.addFluidOutput(*1000); +mythextrac54.build(); + +val mythextrac55 = RecipeBuilder.newBuilder("mythextrac55","mythic_processor_infuser",2); +mythextrac55.addEnergyPerTickInput(1000000); +mythextrac55.addItemInput(); +mythextrac55.addItemOutput(); +mythextrac55.addFluidOutput(*1000); +mythextrac55.build(); + +val mythextrac56 = RecipeBuilder.newBuilder("mythextrac56","mythic_processor_infuser",2); +mythextrac56.addEnergyPerTickInput(1000000); +mythextrac56.addItemInput(); +mythextrac56.addItemOutput(); +mythextrac56.addFluidOutput(*1000); +mythextrac56.build(); + +val mythextrac57 = RecipeBuilder.newBuilder("mythextrac57","mythic_processor_infuser",2); +mythextrac57.addEnergyPerTickInput(1000000); +mythextrac57.addItemInput(); +mythextrac57.addItemOutput(); +mythextrac57.addFluidOutput(*1000); +mythextrac57.build(); + +val mythextrac58 = RecipeBuilder.newBuilder("mythextrac58","mythic_processor_infuser",2); +mythextrac58.addEnergyPerTickInput(1000000); +mythextrac58.addItemInput(); +mythextrac58.addItemOutput(); +mythextrac58.addFluidOutput(*1000); +mythextrac58.build(); + +val mythextrac59 = RecipeBuilder.newBuilder("mythextrac59","mythic_processor_infuser",2); +mythextrac59.addEnergyPerTickInput(1000000); +mythextrac59.addItemInput(); +mythextrac59.addItemOutput(); +mythextrac59.addFluidOutput(*1000); +mythextrac59.build(); + +val mythextrac60 = RecipeBuilder.newBuilder("mythextrac60","mythic_processor_infuser",2); +mythextrac60.addEnergyPerTickInput(1000000); +mythextrac60.addItemInput(); +mythextrac60.addItemOutput(); +mythextrac60.addFluidOutput(*1000); +mythextrac60.build(); + +val mythextrac61 = RecipeBuilder.newBuilder("mythextrac61","mythic_processor_infuser",2); +mythextrac61.addEnergyPerTickInput(1000000); +mythextrac61.addItemInput(); +mythextrac61.addItemOutput(); +mythextrac61.addFluidOutput(*1000); +mythextrac61.build(); + +val mythextrac62 = RecipeBuilder.newBuilder("mythextrac62","mythic_processor_infuser",2); +mythextrac62.addEnergyPerTickInput(1000000); +mythextrac62.addItemInput(); +mythextrac62.addItemOutput(); +mythextrac62.addFluidOutput(*1000); +mythextrac62.build(); + +val mythextrac63 = RecipeBuilder.newBuilder("mythextrac63","mythic_processor_infuser",2); +mythextrac63.addEnergyPerTickInput(1000000); +mythextrac63.addItemInput(); +mythextrac63.addItemOutput(); +mythextrac63.addFluidOutput(*1000); +mythextrac63.build(); + +val mythextrac64 = RecipeBuilder.newBuilder("mythextrac64","mythic_processor_infuser",2); +mythextrac64.addEnergyPerTickInput(1000000); +mythextrac64.addItemInput(.withTag({tank: {FluidName: "essence_of_sane_thoughts", Amount: 16000}})); +mythextrac64.addItemOutput(); +mythextrac64.addFluidOutput(*16000); +mythextrac64.build(); + + + + + + + + + + + + + + + + + @@ -1435,6 +1862,7 @@ mythenrich24.build(); val mythenrich25 = RecipeBuilder.newBuilder("mythenrich25","mythic_processor_infuser",2); mythenrich25.addEnergyPerTickInput(1000000); mythenrich25.addItemInput(*1); +mythenrich25.addItemInput(*1); mythenrich25.addFluidInput(*100000); mythenrich25.addFluidOutput(*100000); mythenrich25.build(); @@ -1696,4 +2124,3 @@ mythenrich61.build(); - diff --git a/scripts/RecipeConflicts.zs b/scripts/RecipeConflicts.zs index 1e9be2cb..012a7ab3 100644 --- a/scripts/RecipeConflicts.zs +++ b/scripts/RecipeConflicts.zs @@ -2550,6 +2550,8 @@ recipes.addShapeless(, recipes.addShapeless(, [, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); +recipes.addShapeless(, +[, , , , .withTag({species: "rootBees", chromosome: 12, allele: "careerbees.effect.accelerate"})]); recipes.addShaped(*64, diff --git a/scripts/Tardis.zs b/scripts/Tardis.zs index 8ecc2c5c..d8a4d53e 100644 --- a/scripts/Tardis.zs +++ b/scripts/Tardis.zs @@ -1199,6 +1199,15 @@ voidgivenform.addFluidInput(*20000); voidgivenform.addFluidOutput(*20000); voidgivenform.build(); +val distillatelevity = RecipeBuilder.newBuilder("distillatelevity","abyssal_entropic_catalyzer",2); +distillatelevity.addItemInput(); +distillatelevity.addItemInput(); +distillatelevity.addFluidInput(*1000); +distillatelevity.addFluidOutput(*16000); +distillatelevity.build(); + + + recipes.addShaped(, diff --git a/scripts/ThaumcraftPowerful.zs b/scripts/ThaumcraftPowerful.zs index 0c37a84f..b987ff94 100644 --- a/scripts/ThaumcraftPowerful.zs +++ b/scripts/ThaumcraftPowerful.zs @@ -218,3 +218,10 @@ mods.thaumcraft.Infusion.registerRecipe("combinealtarscrabinf", "", , , , , , ]); + + + +recipes.addShaped(*8, +[[, , ], +[, , ], +[, , ]]); \ No newline at end of file diff --git a/scripts/ToolTips3.zs b/scripts/ToolTips3.zs index edd0ef96..020c1bee 100644 --- a/scripts/ToolTips3.zs +++ b/scripts/ToolTips3.zs @@ -287,6 +287,7 @@ import crafttweaker.item.IItemCondition; .addTooltip(format.red("使用装有以下3级升级的神龙之力权杖：攻击伤害、挖掘速度、范围挖掘、RF容量、范围攻击")); +.addTooltip(format.red("首个物品通过英玫之门获得"));