From 39e2c9cdcb301003ec967c86263007b5582857c3 Mon Sep 17 00:00:00 2001
From: 0xSeb <info@skate702.de>
Date: Fri, 26 Jun 2015 18:50:54 +0200
Subject: [PATCH] Finally fixed GIT (Thanks to Kombustor) and updatet
 Forge-Imports.

---
 .../skate702/craftingkeys/CraftingKeys.java   | 20 +++++++++----------
 .../java/de/skate702/craftingkeys/Helper.java |  2 +-
 .../proxies/CraftingKeysProxy.java            |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
index db1ac1d..05404bf 100644
--- a/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
+++ b/src/main/java/de/skate702/craftingkeys/CraftingKeys.java
@@ -5,16 +5,16 @@ import org.lwjgl.input.Keyboard;
 import net.minecraft.client.gui.inventory.GuiCrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.util.ChatComponentText;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.SidedProxy;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.Mod.Instance;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
 import de.skate702.craftingkeys.proxies.CraftingKeysProxy;
 
 /**
diff --git a/src/main/java/de/skate702/craftingkeys/Helper.java b/src/main/java/de/skate702/craftingkeys/Helper.java
index d60f0f3..5e96700 100644
--- a/src/main/java/de/skate702/craftingkeys/Helper.java
+++ b/src/main/java/de/skate702/craftingkeys/Helper.java
@@ -3,7 +3,7 @@ package de.skate702.craftingkeys;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
-import cpw.mods.fml.client.FMLClientHandler;
+import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
diff --git a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
index ed28456..20bbef6 100644
--- a/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
+++ b/src/main/java/de/skate702/craftingkeys/proxies/CraftingKeysProxy.java
@@ -2,8 +2,8 @@ package de.skate702.craftingkeys.proxies;
 
 import net.minecraft.client.multiplayer.PlayerControllerMP;
 import net.minecraft.entity.player.EntityPlayer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 /**
  * The common proxy.