0.15 hotfix 1

scripts/AE2JEIdescriptions.zs

@@ -124,3 +124,8 @@ mods.jei.JEI.addDescription([<appliedenergistics2:quantum_link>,
 "",
 "Infinitely expand the range of your wireless terminals.",
 "Connect a quantum bridge to the network which you would like to access wirelessly. Insert the quantum link card into the quantum bridge. Note that this will prevent you from inserting an entangled singularity because a quantum bridge can only have one function at a time. This also replaces the need for a wireless access point."]);
+
+mods.jei.JEI.addDescription([<nae2:part:0>],
+["The Beam Former allows to connect two sections of ME cables at a short distance (32 blocks in a straight line).",
+"",
+"A beam will form between Formers if a path is available between them. The beam can pass through transparent blocks, including other ME cables."]);

scripts/AstralGating.zs

@@ -17,7 +17,66 @@ recipes.addShaped(<astralsorcery:blockblackmarble:0>*8,
 
 mods.astralsorcery.Lightwell.addLiquefaction(<contenttweaker:the_dark_star>, <fluid:astralsorcery.liquidstarlight>, 2.5, 1000.0, 0);
 
-
+recipes.addShapeless(<minecraft:coal_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<minecraft:iron_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<minecraft:gold_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<minecraft:lapis_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<minecraft:redstone_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<minecraft:diamond_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<minecraft:emerald_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:4>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:0>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:1>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:3>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<appliedenergistics2:quartz_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:5>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:6>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:2>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<thermalfoundation:ore:8>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<biomesoplenty:gem_ore:1>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<biomesoplenty:gem_ore:6>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<nuclearcraft:ore:4>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<bigreactors:oreyellorite>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<railcraft:ore_metal:5>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<railcraft:ore:0>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<nuclearcraft:ore:3>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<abyssalcraft:coraliumore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<abyssalcraft:abyore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<erebus:ore_jade>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<techreborn:ore:4>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<libvulpes:ore0:8>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<aoa3:runium_ore>,
+[<contenttweaker:mineralis_ritual>]);
+recipes.addShapeless(<bewitchment:salt_ore>,
+[<contenttweaker:mineralis_ritual>]);
 
 
 // mods.astralsorcery.Altar.addTraitAltarRecipe("MeatballCraft:shaped/internal/altar/skythernEMC", 

scripts/CustomItems2.zs

@@ -382,4 +382,9 @@ orichalcum.register();
 var dreminfusioncrafting = VanillaFactory.createItem("dream_infusion_crafting");
 dreminfusioncrafting.maxStackSize = 64;
 dreminfusioncrafting.beaconPayment = false;
-dreminfusioncrafting.register();
+dreminfusioncrafting.register();
+
+var mineralisritual = VanillaFactory.createItem("mineralis_ritual");
+mineralisritual.maxStackSize = 64;
+mineralisritual.beaconPayment = false;
+mineralisritual.register();

scripts/MythicProcessorAlloys.zs

@@ -406,12 +406,12 @@ mythallo54.addItemInput(<ore:ingotIridium>);
 mythallo54.addItemOutput(<ore:ingotTitaniumIridium>*2);
 mythallo54.build();
 
-val mythallo55 = RecipeBuilder.newBuilder("mythallo55","mythic_processor_alloy_furnace",1);
-mythallo55.addEnergyPerTickInput(80000);
-mythallo55.addItemInput(<contenttweaker:unidentified_ingot>);
-mythallo55.addItemInput(<ore:ingotMithrillium>*3);
-mythallo55.addItemOutput(<ore:ingotCrystalMatrix>*2);
-mythallo55.build();
+// val mythallo55 = RecipeBuilder.newBuilder("mythallo55","mythic_processor_alloy_furnace",1);
+// mythallo55.addEnergyPerTickInput(80000);
+// mythallo55.addItemInput(<contenttweaker:unidentified_ingot>);
+// mythallo55.addItemInput(<thaumadditions:mithrillium_ingot>*3);
+// mythallo55.addItemOutput(<avaritia:resource:1>*2);
+// mythallo55.build();
 
 val mythallo56 = RecipeBuilder.newBuilder("mythallo56","mythic_processor_alloy_furnace",1);
 mythallo56.addEnergyPerTickInput(80000);
@@ -427,12 +427,12 @@ mythallo57.addItemInput(<divinerpg:mortum_chunk>);
 mythallo57.addItemOutput(<extendedcrafting:material:32>*8);
 mythallo57.build();
 
-val mythallo58 = RecipeBuilder.newBuilder("mythallo58","mythic_processor_alloy_furnace",1);
-mythallo58.addEnergyPerTickInput(80000);
-mythallo58.addItemInput(<contenttweaker:matrix_ore>);
-mythallo58.addItemInput(<aoa3:shyrestone_block>);
-mythallo58.addItemOutput(<ore:ingotCrystalMatrix>*8);
-mythallo58.build();
+// val mythallo58 = RecipeBuilder.newBuilder("mythallo58","mythic_processor_alloy_furnace",1);
+// mythallo58.addEnergyPerTickInput(80000);
+// mythallo58.addItemInput(<contenttweaker:matrix_ore>);
+// mythallo58.addItemInput(<aoa3:shyrestone_block>);
+// mythallo58.addItemOutput(<avaritia:resource:1>*8);
+// mythallo58.build();
 
 val mythallo59 = RecipeBuilder.newBuilder("mythallo59","mythic_processor_alloy_furnace",1);
 mythallo59.addEnergyPerTickInput(80000);
@@ -481,7 +481,8 @@ val mythallo65 = RecipeBuilder.newBuilder("mythallo65","mythic_processor_alloy_f
 mythallo65.addEnergyPerTickInput(80000);
 mythallo65.addItemInput(<ore:emcDarkMatter>*4);
 mythallo65.addItemInput(<ore:emcRedMatter>*12);
-mythallo65.addItemOutput(<contenttweaker:calcite_gem>);
+mythallo65.addItemInput(<contenttweaker:calcite_gem>);
+mythallo65.addItemOutput(<ore:ingotModularium>);
 mythallo65.build();
 
 val mythallo66 = RecipeBuilder.newBuilder("mythallo66","mythic_processor_alloy_furnace",1);
@@ -621,7 +622,7 @@ val mythallo85 = RecipeBuilder.newBuilder("mythallo85","mythic_processor_alloy_f
 mythallo85.addEnergyPerTickInput(80000);
 mythallo85.addItemInput(<ore:ingotBloodInfusedIron>);
 mythallo85.addItemInput(<minecraft:porkchop>);
-mythallo85.addItemOutput(<ore:ingotPigIron>*4);
+mythallo85.addItemOutput(<tconstruct:ingots:4>*4);
 mythallo85.build();
 
 val mythallo86 = RecipeBuilder.newBuilder("mythallo86","mythic_processor_alloy_furnace",1);
@@ -771,7 +772,7 @@ mythallo106.addItemInput(<ore:dustSednanite>);
 mythallo106.addItemInput(<thaumcraft:void_seed>);
 mythallo106.addItemInput(<divinerpg:corrupted_stone>);
 mythallo106.addItemInput(<ore:ingotHoneyComb>);
-mythallo106.addItemOutput(<ore:ingotDemonicSteel>*2);
+mythallo106.addItemOutput(<contenttweaker:etherium_ingot>);
 mythallo106.build();
 
 val mythallo107 = RecipeBuilder.newBuilder("mythallo107","mythic_processor_alloy_furnace",1);

scripts/MythicProcessorRollingMachine.zs

@@ -8,7 +8,7 @@ mythroll1.addItemInput(<contenttweaker:abyssal_alloy_ingot>);
 mythroll1.addItemInput(<contenttweaker:twilight_alloy_ingot>);
 mythroll1.addItemInput(<contenttweaker:thermionic_alloy_ingot>);
 mythroll1.addItemInput(<contenttweaker:high_refraction_alloy_ingot>);
-mythroll1.addItemOutput(<contenttweaker:infinity_plate>);
+mythroll1.addItemOutput(<contenttweaker:infinity_plate>*4);
 mythroll1.build();
 
 val mythroll2 = RecipeBuilder.newBuilder("mythroll2","mythic_processor_rolling_machine",2);
@@ -29,7 +29,7 @@ val mythroll4 = RecipeBuilder.newBuilder("mythroll4","mythic_processor_rolling_m
 mythroll4.addEnergyPerTickInput(60000);
 mythroll4.addItemInput(<ore:ingotPalladium>*4);
 mythroll4.addItemInput(<ore:ingotPolonium>);
-mythroll4.addItemOutput(<contenttweaker:arc_coil>*2);
+mythroll4.addItemOutput(<contenttweaker:arc_coil>);
 mythroll4.build();
 
 val mythroll5 = RecipeBuilder.newBuilder("mythroll5","mythic_processor_rolling_machine",2);
@@ -53,7 +53,7 @@ val mythroll7 = RecipeBuilder.newBuilder("mythroll7","mythic_processor_rolling_m
 mythroll7.addEnergyPerTickInput(60000);
 mythroll7.addItemInput(<ore:ingotAluminum>*6);
 mythroll7.addItemInput(<ore:dustMagnesium>*3);
-mythroll7.addItemOutput(<ore:plateMagnalium>);
+mythroll7.addItemOutput(<ore:plateMagnalium>*3);
 mythroll7.build();
 
 
@@ -125,5 +125,5 @@ mythroll16.build();
 val mythroll17 = RecipeBuilder.newBuilder("mythroll17","mythic_processor_rolling_machine",2);
 mythroll17.addEnergyPerTickInput(60000);
 mythroll17.addItemInput(<ore:plateTitaniumIridium>*4);
-mythroll17.addItemOutput(<libvulpes:productsheet:1>*4);
+mythroll17.addItemOutput(<ore:sheetTitaniumIridium>*4);
 mythroll17.build();

scripts/OresJEIDescriptions.zs

@@ -157,7 +157,7 @@ mods.jei.JEI.addDescription(<thermalfoundation:material:131>,["Found between Y=5
 mods.jei.JEI.addDescription(<thermalfoundation:material:132>,["Found between Y=40 and Y=75."]);
 mods.jei.JEI.addDescription(<thermalfoundation:material:133>,["Found between Y=5 and Y=20."]);
 mods.jei.JEI.addDescription(<thermalfoundation:material:134>,["Found between Y=5 and Y=16."]);
-mods.jei.JEI.addDescription(<thermalfoundation:material:134>,["Found between Y=20 and Y=70."]);
+mods.jei.JEI.addDescription(<thermalfoundation:material:134>,["Found between Y=20 and Y=70 in the end."]);
 mods.jei.JEI.addDescription(<thermalfoundation:material:135>,["Found rarely in the overworld, or in the end from sheldonite ore"]);
 mods.jei.JEI.addDescription(<thermalfoundation:material:136>,["Found in the Elemental Chamber dungeon in the Nether."]);
 mods.jei.JEI.addDescription(<thermalfoundation:material:771>,["Found near lava lakes underground, and dropped by blaze"]);

scripts/RecipeConflicts.zs

@@ -1673,3 +1673,4 @@ mods.chisel.Carving.addVariation("ayeracostatuescolored", <divinerpg:ayeraco_sta
 mods.chisel.Carving.addVariation("ayeracostatuescolored", <divinerpg:ayeraco_statue_green>);
 mods.chisel.Carving.addVariation("ayeracostatuescolored", <divinerpg:ayeraco_statue_purple>);
 
+mods.nuclearcraft.melter.addRecipe([<minecraft:rotten_flesh>, <fluid:blood>*40]);

scripts/ToolTips.zs

@@ -626,3 +626,5 @@
 <divinerpg:tormented_chestplate>.addTooltip(format.red("Uses 14 Lumps"));
 <divinerpg:tormented_leggings>.addTooltip(format.red("Uses 11 Lumps"));
 <divinerpg:tormented_boots>.addTooltip(format.red("Uses 8 Lumps"));
+
+<contenttweaker:radioactive_residue>.addTooltip(format.red("Warning: this crafting chain produces radiation!"));