Merge branch 'master' of github.com:williewillus/Botania

This commit is contained in:
Vincent Lee committed 2016-08-24 21:27:50 -05:00
commit 6db2aa7dee
2 files changed
+3

No files matched your search

@@ -423,6 +423,7 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.DYE[i], new ItemStack(dye, 1, i));
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
}
OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dye, 1, OreDictionary.WILDCARD_VALUE));
for(int i = 0; i < 7; i++)
OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i));
@@ -49,6 +49,8 @@ public final class LibOreDict {
public static final String PRISMARINE_BLOCK = "blockPrismarine";
public static final String BLAZE_BLOCK = "blockBlaze";
public static final String DYE_WILDCARD = "dye";
public static final String[] FLOWER = new String[] {
"mysticFlowerWhite", "mysticFlowerOrange", "mysticFlowerMagenta", "mysticFlowerLightBlue",
"mysticFlowerYellow", "mysticFlowerLime", "mysticFlowerPink", "mysticFlowerGray",