Fixed compile errors with last commit, sorry

This commit is contained in:
Modmuss50 2015-04-17 17:46:45 +01:00
parent 8f33305025
commit 8d8814bb77
2 changed files with 1 additions and 5 deletions

View file

@ -5,11 +5,8 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
<<<<<<< HEAD
import net.minecraftforge.common.MinecraftForge;
=======
import techreborn.achievement.TRAchievements;
>>>>>>> d5628ff93a9b7d42a02be9eb21b95d57313cd15e
import techreborn.client.GuiHandler;
import techreborn.compat.CompatManager;
import techreborn.config.ConfigTechReborn;

View file

@ -1,6 +1,5 @@
package techreborn.multiblocks;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity;
import techreborn.api.multiblock.BaseMultiBlock;
import techreborn.init.ModBlocks;
@ -31,6 +30,6 @@ public class MultiBlastfurnace extends BaseMultiBlock {
@Override
public void recompute() {
com
}
}