tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Resolved conflict

Browse source
This commit is contained in:
thatsIch 2014-09-29 23:36:53 +02:00
commit 39b464fb2f
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/appeng/container/AEBaseContainer.java
View file

@ -573,7 +573,11 @@ public abstract class AEBaseContainer extends Container
{ {
ICrafting icrafting = (ICrafting) crafter; ICrafting icrafting = (ICrafting) crafter;
<<<<<<< HEAD
for (SyncData sd : syncData.values()) for (SyncData sd : syncData.values())
=======
for (SyncDat sd : syncData.values())
>>>>>>> caffaef8350df972a8fb154db7909e1911ff6bc3
{ {
sd.tick( icrafting ); sd.tick( icrafting );
} }