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

+7 -2
View File
@@ -11,9 +11,14 @@ import tconstruct.library.util.IPattern;
public class Pattern extends CraftingItem implements IPattern
{
public Pattern(int id, String partType, String patternType, String folder)
public Pattern(int id, String patternType, String folder)
{
super(id, patternName, getPatternNames(patternType), folder);
this(id, patternName, getPatternNames(patternType), folder);
}
public Pattern(int id, String[] names, String[] patternTypes, String folder)
{
super(id, names, patternTypes, folder);
this.setHasSubtypes(true);
this.setMaxDamage(0);
this.setContainerItem(this);