upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 08:54:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
mDiyo committed 2013-12-06 11:46:23 -08:00
2 parents 85aaa05d4b bbec72109a
commit 91271f6bb2
22 files changed
+38 -606
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/common/TRecipes.java
+1
View File
@@ -6,6 +6,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import mantle.blocks.iface.MultiServantLogic;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.item.Item;