Merge branch 'master' into weaponry

Conflicts:
	src/main/java/tconstruct/items/tools/Arrow.java
	src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-19 14:12:50 +02:00
commit f31e41447c
11 files changed
+85 -79

No files matched your search

@@ -3,6 +3,7 @@ package tconstruct.modifiers.armor;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import tconstruct.armor.items.TravelGear;
import tconstruct.library.modifier.IModifyable;
import tconstruct.library.modifier.ItemModifier;
public class TravelModRepair extends ItemModifier
@@ -110,4 +111,9 @@ public class TravelModRepair extends ItemModifier
{
//Nope
}
@Override
public boolean validType(IModifyable input) {
return input.getModifyType().equals("Clothing");
}
}