manual merge of master branch changes up to commit 1387bc6

This commit is contained in:
Progwml6 committed 2013-11-23 09:31:19 -05:00
1 parent 2d99d5dba2
commit 14d357ccf6
23 files changed
+317 -172

No files matched your search

@@ -16,7 +16,7 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike
private Icon baseIcon;
public ArmorPattern(int id, String partType, String patternType, String folder)
public ArmorPattern(int id, String patternType, String folder)
{
super(id, patternName, getPatternNames(patternType), folder);
this.setHasSubtypes(true);
@@ -50,10 +50,10 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike
public void getSubItems (int id, CreativeTabs tab, List list)
{
for (int i = 0; i < patternName.length; i++)
/*for (int i = 0; i < patternName.length; i++)
{
list.add(new ItemStack(id, 1, i));
}
}*/
}
}