Merge upstream

This commit is contained in:
Vincent Lee committed 2015-11-17 01:07:15 -06:00
commit 750276db9b
100 files changed
+525 -84

No files matched your search

@@ -168,6 +168,9 @@ public final class ModCraftingRecipes {
public static IRecipe recipeLensWeight;
public static IRecipe recipeLensPaint;
public static IRecipe recipeLensWarp;
public static IRecipe recipeLensRedirect;
public static IRecipe recipeLensFirework;
public static IRecipe recipeLensFlare;
public static List<IRecipe> recipesMiniIsland;
public static IRecipe recipeGaiaPylon;
public static IRecipe recipeGatherDrum;
@@ -1104,7 +1107,7 @@ public final class ModCraftingRecipes {
'L', new ItemStack(ModItems.lens));
recipeLensWeight = BotaniaAPI.getLatestAddedRecipe();
// Paint Lens Recipe
// Paintslinger Lens Recipe
addOreDictRecipe(new ItemStack(ModItems.lens, 1, 14),
" E ", "WLW", " E ",
'E', LibOreDict.ELEMENTIUM,
@@ -1116,6 +1119,18 @@ public final class ModCraftingRecipes {
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 18), new ItemStack(ModItems.lens), LibOreDict.PIXIE_DUST);
recipeLensWarp = BotaniaAPI.getLatestAddedRecipe();
// Redirective Lens Recipe
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 19), new ItemStack(ModItems.lens), LibOreDict.LIVING_WOOD, LibOreDict.ELEMENTIUM);
recipeLensRedirect = BotaniaAPI.getLatestAddedRecipe();
// Celebratory Lens Recipe
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 20), new ItemStack(ModItems.lens), new ItemStack(Items.fireworks), LibOreDict.ELEMENTIUM);
recipeLensFirework = BotaniaAPI.getLatestAddedRecipe();
// Flare Lens Recipe
addShapelessOreDictRecipe(new ItemStack(ModItems.lens, 1, 21), new ItemStack(ModItems.lens), new ItemStack(ModBlocks.elfGlass), LibOreDict.ELEMENTIUM);
recipeLensFlare = BotaniaAPI.getLatestAddedRecipe();
// Mini Island Recipes
for(int i = 0; i < 16; i++)
GameRegistry.addRecipe(new ItemStack(ModBlocks.floatingFlower, 1, i),