diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index c6747e034..c6e32f54b 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -59,7 +59,9 @@ public class RecipesIC2 implements ICompatModule { public void addTRRecipes() { //General - CraftingHelper.addShapedOreRecipe( + CraftingHelper.addShapelessOreRecipe(new ItemStack(ModItems.manuel), IC2Items.getItem("plateiron"), Items.book); + + CraftingHelper.addShapedOreRecipe( ItemParts.getPartByName("machineParts", 16), "CSC", "SCS", "CSC", 'S', "ingotSteel", @@ -1189,7 +1191,7 @@ public class RecipesIC2 implements ICompatModule { static void addShappedIc2Recipes() { Item drill = IC2Items.getItem("miningDrill").getItem(); ItemStack drillStack = new ItemStack(drill, 1, OreDictionary.WILDCARD_VALUE); - + if (ConfigTechReborn.ExpensiveMacerator) CraftingHelper.addShapedOreRecipe(IC2Items.getItem("macerator"), "FDF", "DMD", "FCF", diff --git a/src/main/java/techreborn/pda/pages/BasePage.java b/src/main/java/techreborn/pda/pages/BasePage.java index b7e2c1191..f7951784f 100644 --- a/src/main/java/techreborn/pda/pages/BasePage.java +++ b/src/main/java/techreborn/pda/pages/BasePage.java @@ -90,7 +90,7 @@ public class BasePage extends GuiScreen { @Override public void actionPerformed(GuiButton button) { - if (button.id == 0)collection.changeActivePage("INDEX"); + if (button.id == 0)collection.changeActivePage("CONTENTS"); } @Override public void mouseMovedOrUp(int par1, int par2, int par3){super.mouseMovedOrUp(par1, par2, par3);} diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index 2fbc707e5..ed155a7cf 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -677,6 +677,7 @@ item.techreborn.lapotronpack.name=Lapotron Pack item.techreborn.omniTool.name=Omni tool item.techreborn.advancedDrill.name=Advanced Drill item.techreborn.lapotronicorb.name=Lapotronic Energy Orb +item.techreborn.cloakingdevice.name=Cloaking Device #Buckets item.bucketberylium.name=Berylium Bucket @@ -834,6 +835,14 @@ Cable.ironCable.name=Iron Cable Cable.copperCable.name=Copper Cable Cable.insulatedIronCable.name=Insulated Iron Cable Cable.doubleInsulatedIronCable.name=Double Insulated Copper Cable -Cable.trippleInsulatedIronCable.name=Tipple Insulated Copper Cable +Cable.trippleInsulatedIronCable.name=Triple Insulated Copper Cable Cable.glassFiberCable.name=Glass Fiber Cable Cable.tinCable.name=Tin Cable + +#PDA +item.techreborn.advancedDrill.description=This Tool is a advanced version of the mining drill, when this item is activated it will dig out a 3x3. +tile.techreborn.alloyfurnace.description=This Machine is your first step into TechReborn with this you can fuse metals into other metals. These other metals can be used to craft the higher tier machines. +tile.techreborn.alloysmelter.description=This machine is a upgraded version of the Alloy Furnace, This block requires EU or RF. +tile.techreborn.assemblingmachine.description=This block is used to craft some of the more complex machines that can't be crafted in a normal crafting table. +tile.techreborn.blastfurnace.description=This Machine needs a 3x4x3 of machine casings behind it to increase its internal heat, The hotter the machine is the more recipes will open up to you. This machine also needs EU/RF. +