Resolved conflicts

This commit is contained in:
thatsIch 2014-09-29 23:51:00 +02:00
commit abfec0946c

View file

@ -574,11 +574,9 @@ public abstract class AEBaseContainer extends Container
ICrafting icrafting = (ICrafting) crafter; ICrafting icrafting = (ICrafting) crafter;
for (SyncData sd : syncData.values()) for (SyncData sd : syncData.values())
{
sd.tick( icrafting ); sd.tick( icrafting );
} }
} }
}
super.detectAndSendChanges(); super.detectAndSendChanges();
} }