Merge remote-tracking branch 'origin/master' into dev

scripts/Extra-Utilities.zs

@@ -182,6 +182,7 @@ val TravelWings = <TConstruct:travelWings>.withTag({TinkerArmor: {BaseDurability
 val MagicalFeather = <miscutils:magicfeather>;
 val Netherstar = <minecraft:nether_star>;
 val IridiumRing = <gregtech:gt.metaitem.01:28084>;
+
 val BigPearl = <Avaritia:big_pearl>;
 val PrimalCharm = <Thaumcraft:ItemResource:15>;
 val DragonEgg = <minecraft:dragon_egg>;
@@ -193,6 +194,8 @@ val TFFireFly = <TwilightForest:tile.TFFirefly>;
 val EngravedGC = <dreamcraft:item.EngravedGoldChip>;
 val InfinityCatalyst = <Avaritia:Resource:5>;
 val SalisMundus = <Thaumcraft:ItemResource:14>;
+val TritScrew = <gregtech:gt.metaitem.01:27329>;
+
 
 // --- Removing Recipes ---
 
@@ -507,13 +510,13 @@ recipes.remove(<ExtraUtilities:endConstructor:2>);
 
 // --- Block Update Detector
 recipes.remove(<ExtraUtilities:budoff>);
- 
+
 // --- Block Update Detector (Advanced)
 recipes.remove(<ExtraUtilities:budoff:3>);
- 
+
 // --- Chandelier
 recipes.remove(Chandelier);
- 
+
 // --- Edged Stone Bricks
 recipes.remove(<ExtraUtilities:decorativeBlock1>);
 
@@ -1121,7 +1124,7 @@ AlloySmelter.addRecipe(<ExtraUtilities:decorativeBlock2:4>, <ExtraUtilities:deco
 AlloySmelter.addRecipe(<ExtraUtilities:decorativeBlock2:3>, <ExtraUtilities:decorativeBlock2>, <minecraft:gunpowder>, 200, 8);
 
 // --- Glowstone Glass
-AlloySmelter.addRecipe(<ExtraUtilities:decorativeBlock2:7>, <ExtraUtilities:decorativeBlock2>, <gregtech:gt.metaitem.01:17811> * 4, 400, 16); 
+AlloySmelter.addRecipe(<ExtraUtilities:decorativeBlock2:7>, <ExtraUtilities:decorativeBlock2>, <gregtech:gt.metaitem.01:17811> * 4, 400, 16);
 
 // --- Heart Glass
 AlloySmelter.addRecipe(<ExtraUtilities:decorativeBlock2:8>, <ExtraUtilities:decorativeBlock2>, <minecraft:dye:9>, 200, 8);
@@ -1167,10 +1170,10 @@ Assembler.addRecipe(<ExtraUtilities:endConstructor:2>, <ExtraUtilities:decorativ
 
 // --- Block Update Detector
 Assembler.addRecipe(<ExtraUtilities:budoff>, <Railcraft:detector:2>, <minecraft:sticky_piston>, 200, 30);
- 
+
 // --- Block Update Detector (Advanced)
 Assembler.addRecipe(<ExtraUtilities:budoff:3>, <ExtraUtilities:budoff>, <minecraft:redstone_block> * 4, 200, 120);
- 
+
 // --- Chandelier
 Assembler.addRecipe(Chandelier, <minecraft:torch> * 5, <gregtech:gt.metaitem.02:28500>, <liquid:molten.tin> * 1440, 600, 30);
 
@@ -1336,7 +1339,7 @@ Extractor.addRecipe(<ExtraUtilities:cobblestone_compressed:14> * 9, <ExtraUtilit
 
 // --- Angel Wing over Thaumcraft ---
 // --- ARInvisableWings
-Infusion.addRecipe("EXURINGS_CRAFTING", TravelWings, [EngravedGC, IridiumRing, AngelBlock, PrimalCharm, MagicalFeather, Netherstar, BigPearl, Netherstar, MagicalFeather, PrimalCharm, AngelBlock, IridiumRing], "praecantatio 200, volatus 200, tempestas 200, nebrisum 200, motus 200, terminus 200", ARInvisableWings, 30);
+Infusion.addRecipe("EXURINGS_CRAFTING", TravelWings, [IridiumRing, TritScrew, EngravedGC, AngelBlock, PrimalCharm, MagicalFeather, Netherstar, BigPearl, Netherstar, MagicalFeather, PrimalCharm, AngelBlock, EngravedGC, TritScrew], "praecantatio 200, volatus 200, tempestas 200, nebrisum 200, motus 200, terminus 200", ARInvisableWings, 30);
 
 // --- ARFeatheryWings
 Infusion.addRecipe("EXURINGS_CRAFTING", ARInvisableWings, [SalisMundus, FeatherFletching, FeatherFletching], "permutatio 50, volatus 50, aer 50", ARFeatheryWings, 4);
@@ -1360,13 +1363,14 @@ Research.addPrereq("EXURINGS", "INFUSION", true);
 Research.addPage("EXURINGS", "tc.research_page.EXURINGS.1");
 game.setLocalization("en_US", "tc.research_page.EXURINGS.1", "Happy to have crafted or looted your first Copter Pack or in general having access to Jetpacks?<BR>Annoyed about the fact that you need some type of fuel or energy for your Jetpack to work?<BR>What would a Thaumaturge give to achieve the ability to fly without these restrictions?<BR>Maybe some §oWarp§r? Not at this point yet, maybe later?<BR>But what should you do now to achieve §oFreedom like a bird§r? Maybe you remember Icarus and what happened to him?");
 Research.addPage("EXURINGS", "tc.research_page.EXURINGS.2");
-game.setLocalization("en_US", "tc.research_page.EXURINGS.2", "If you remeber (well, let us say §othat§r you remember) then why not taking a look the §oTraveller's Wings§r§r? For me they could be the key for what you want to achieve but even if you own them, what should you do with them?<BR> I would like to ... try to infuse them with ... what items would you need you may ask and the final result will be ...?<BR>Pretty out of ideas I see so let us make some theoretical studies first:<BR>You want to fly like a bird? Try to get §oVolatus§r because it is referenced to Flight. Another ingredient could be §oTempestas§r to withstand the harsh weather out there.");
+game.setLocalization("en_US", "tc.research_page.EXURINGS.2", "If you remeber (well, let us say §othat§r you remember) then why not taking a look the §oTraveller's Wings§r§r? For me they could be the key for what you want to achieve but even if you own them, what should you do with them?<BR> I would like to ... try to infuse them with ... what items would you need you may ask and the final result will be ...?<BR>Pretty out of ideas I see so let us make some theoretical studies first:<BR>You want to fly like a bird? Try to get §oVolatus§r because it is referenced to flight. Another ingredient could be §oTempestas§r to withstand the harsh weather out there.");
+
 Research.addPage("EXURINGS", "tc.research_page.EXURINGS.3");
 game.setLocalization("en_US", "tc.research_page.EXURINGS.3", "The next as obvious would be §oPraecantatio§r as we are going to use magic after all to achieve your goal otherwise it wouldn't make sense, wouldn't it? Also §oMotus§r will be required.<BR>Well done, we got the §oMain Aspects§r but how can we get rid of requiring energy or fuel? I would suggest to get §oNebrisum§r the source of §oCheatines§r. Yes, you are right, we are going to cheat a little bit for your goal but don't blame me for that §oTerminus§r I couldn't withstand to use it.<BR>You should have a few Jars filled with §oVolatus, Tempestas, Praecantatio, Nebrisum, Motus§r and §oTerminus§r to be prepared.<LINE>");
 Research.addPage("EXURINGS", "tc.research_page.EXURINGS.4");
 game.setLocalization("en_US", "tc.research_page.EXURINGS.4", "Now it is time to find out which items you would need for the infusion as well as the item to be infused with.<LINE> From the secound page we have the §oTraveller's Wings§r which I would suggest to be used as the key item and infuse them with all other items at the §oInfusion Altar§r.<BR> At last you would need §oNether Stars§r and §oAngel Blocks§r the first part of ingredients.<LINE>");
 Research.addPage("EXURINGS", "tc.research_page.EXURINGS.5");
-game.setLocalization("en_US", "tc.research_page.EXURINGS.5", "Now we are getting to the downside of this list ... gregified items are also used for ... reasons.<LINE> The first downside will be from GT++:<BR>§oMagical Feather§r at last two of them which requiring you to be in §oEV Age§r before you can continue at this point. Last ones which I throw to you will be an §oEngraved Gold Chip§r and §oIridium Rings§r.<BR>Congrats, you gathered all the materials you'll need ... theoretically. So now go out and get them and come back to me when you have acquired them.<LINE>");
+game.setLocalization("en_US", "tc.research_page.EXURINGS.5", "Now we are getting to the downside of this list ... gregified items are also used for ... reasons.<LINE> The first downside will be from GT++:<BR>§oMagical Feather§r at last two of them which requiring you to be in §oEV Age§r before you can continue at this point. Last ones which I throw to you will be two §oEngraved Gold Chips§r, one §oIchorium Rings§r and two §oTritanium Screws§r.<BR>Congrats, you gathered all the materials you'll need ... theoretically. So now go out and get them and come back to me when you have acquired them.<LINE>");
 Research.addPage("EXURINGS", "tc.research_page.EXURINGS.6");
 game.setLocalization("en_US", "tc.research_page.EXURINGS.6", "The next research will show you the recipes for your beloved item: §oExU's Angel Ring§r and they come in different styles too.<LINE>");
 
@@ -1381,7 +1385,7 @@ Research.addPage("EXURINGS_CRAFTING", "tc.research_page.EXURINGS_CRAFTING.1");
 game.setLocalization("en_US", "tc.research_page.EXURINGS_CRAFTING.1", "Ok, you got all the items and jarred essentia? Oh and thanks for taking some warp because warp is fun, isn't it? Well at last it is the payment<LINE>Fine here are all the recipes you wanted. Have fun with them but don't blame me for there own difficulty to aquire them before you can use them finally in these recipes.<LINE>First recipe: Angel Ring (Invisible Wings)<BR>Oh, totally forgotten to tell you about some §oPearl§r and §oCharms§r, sorry.");
 Research.addInfusionPage("EXURINGS_CRAFTING", ARInvisableWings);
 Research.addPage("EXURINGS_CRAFTING", "tc.research_page.EXURINGS_CRAFTING.2");
-game.setLocalization("en_US", "tc.research_page.EXURINGS_CRAFTING.2", "So you assumed to get an Arcane Recipe here for all these different variants? Nope, it will be Infusion too as the Arcane Table can't handle the power which is hidden within this powerful item. For this time take a look on the following recipes to get all the items and the essentia together.<LINE>Second and following ones are Angel Rings with the following options: Golden Wings, Dragon Wings, Feathery Wings, Fairy Wings.<BR>Note that when you have transmogrified your wings that this step is final. This means, that you need at last five rings to own the compleate collection ... whyever you would do this.");
+game.setLocalization("en_US", "tc.research_page.EXURINGS_CRAFTING.2", "So you assumed to get an Arcane Recipe here for all these different variants? Nope, it will be Infusion too as the Arcane Table can't handle the power which is hidden within this powerful item. For this time take a look on the following recipes to get all the items and the essentia together.<LINE>Second and following ones are Angel Rings with the following options: Golden Wings, Dragon Wings, Feathery Wings, Fairy Wings.<BR>Note that when you have transmogrified your wings that this step is final. This means, that you need at last five rings to own the complete collection ... whyever you would do this.");
 Research.addInfusionPage("EXURINGS_CRAFTING", ARFeatheryWings);
 Research.addInfusionPage("EXURINGS_CRAFTING", ARFairyWings);
 Research.addInfusionPage("EXURINGS_CRAFTING", ARDragonWings);