From 8d8814bb77f41e95ed9dd9e120eab20af6568d74 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Fri, 17 Apr 2015 17:46:45 +0100 Subject: [PATCH] Fixed compile errors with last commit, sorry --- src/main/java/techreborn/Core.java | 3 --- src/main/java/techreborn/multiblocks/MultiBlastfurnace.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index fa26c502d..664b8249d 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -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; diff --git a/src/main/java/techreborn/multiblocks/MultiBlastfurnace.java b/src/main/java/techreborn/multiblocks/MultiBlastfurnace.java index 323602952..09e61929a 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlastfurnace.java +++ b/src/main/java/techreborn/multiblocks/MultiBlastfurnace.java @@ -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 + } }