fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflict

Browse Source
This commit is contained in:
thatsIch
2014-09-29 23:36:53 +02:00
parent a21268a7b5 caffaef835
commit 39b464fb2f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+4
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 );
} }