Merge upstream

This commit is contained in:
Vincent Lee committed 2016-02-18 10:04:02 -06:00
commit ad5b7fd73b
15 files changed
+460 -337

No files matched your search

@@ -423,6 +423,9 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i));
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
}
for(int i = 0; i < 7; i++)
OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i));
OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar);
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaResource, 1, 0));
OreDictionary.registerOre(LibOreDict.MANA_PEARL, new ItemStack(manaResource, 1, 1));