Merge branch 'master' into weaponry

Conflicts:
	src/main/java/tconstruct/tools/TinkerTools.java
This commit is contained in:
Bernhard Bonigl committed 2014-10-16 16:13:11 +02:00
commit 65ce5f23c2
11 files changed
+163 -67

No files matched your search

@@ -49,6 +49,7 @@ public final class IMCHandler {
ToolMaterial mat = scanMaterial(tag);
if(mat != null) {
TConstructRegistry.addtoolMaterial(tag.getInteger("Id"), mat);
TConstructRegistry.addDefaultToolPartMaterial(tag.getInteger("Id"));
TConstruct.logger.info("IMC: Added material " + mat.materialName);
}
}