manual update of all master commits up to ca86fa8

This commit is contained in:
Progwml6 committed 2013-11-25 14:08:18 -05:00
1 parent 14d357ccf6
commit 983c91c2c9
48 files changed
+680 -158

No files matched your search

@@ -24,28 +24,10 @@ public class MaterialItem extends CraftingItem
static String[] materialNames = new String[] { "PaperStack", "SlimeCrystal", "SearedBrick", "CobaltIngot", "ArditeIngot", "ManyullynIngot", "Mossball", "LavaCrystal", "NecroticBone",
"CopperIngot", "TinIngot", "", "RawAluminum", "BronzeIngot", "AluBrassIngot", "AlumiteIngot", "SteelIngot", "BlueSlimeCrystal", "ObsidianIngot", "IronNugget", "CopperNugget", "TinNugget",
"AluminumNugget", "EssenceCrystal", "AluBrassNugget", "SilkyCloth", "SilkyJewel", "ObsidianNugget", "CobaltNugget", "ArditeNugget", "ManyullynNugget", "BronzeNugget", "AlumiteNugget",
"SteelNugget", "PigIronIngot", "PigIronNugget" };
"SteelNugget", "PigIronIngot", "PigIronNugget", "GlueBall" };
static String[] craftingTextures = new String[] { "paperstack", "slimecrystal", "searedbrick", "cobaltingot", "arditeingot", "manyullyningot", "mossball", "lavacrystal", "necroticbone",
"copperingot", "tiningot", "aluminumingot", "aluminumraw", "bronzeingot", "alubrassingot", "alumiteingot", "steelingot", "blueslimecrystal", "obsidianingot", "nugget_iron",
"nugget_copper", "nugget_tin", "nugget_aluminum", "", "nugget_alubrass", "silkycloth", "silkyjewel", "nugget_obsidian", "nugget_cobalt", "nugget_ardite", "nugget_manyullyn",
"nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron" };
/*@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
if (stack.getItemDamage() == 23)
{
if (stack.hasTagCompound())
{
int amount = stack.getTagCompound().getInteger("Essence");
list.add("Stored Levels: " + EssenceExtractorLogic.getEssencelevels(amount));
}
else
{
list.add("Stored Levels: 0");
}
}
}*/
"nugget_bronze", "nugget_alumite", "nugget_steel", "pigironingot", "nugget_pigiron", "glueball" };
}