Resolved conflicts

This commit is contained in:
thatsIch
2014-09-29 23:51:00 +02:00
@@ -574,9 +574,7 @@ public abstract class AEBaseContainer extends Container
ICrafting icrafting = (ICrafting) crafter;
for (SyncData sd : syncData.values())
{
sd.tick( icrafting );
}
}
}