Import changes

src/dark/assembly/ALRecipeLoader.java

@@ -8,7 +8,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
 import dark.assembly.machine.BlockCrate;
 import dark.assembly.machine.processor.BlockProcessor;
-import dark.machines.common.RecipeLoader;
+import dark.core.prefab.RecipeLoader;
 
 public class ALRecipeLoader extends RecipeLoader
 {

src/dark/assembly/AssemblyLine.java

@@ -57,11 +57,11 @@ import dark.assembly.machine.encoder.BlockEncoder;
 import dark.assembly.machine.encoder.ItemDisk;
 import dark.assembly.machine.processor.BlockProcessor;
 import dark.assembly.machine.red.BlockAdvancedHopper;
+import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry;
 import dark.core.prefab.ItemBlockHolder;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DMCreativeTab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 @ModstatInfo(prefix = "asmline")
 @Mod(modid = AssemblyLine.MOD_ID, name = AssemblyLine.MOD_NAME, version = DarkMain.VERSION, dependencies = "required-after:DarkCore", useMetadata = true)

src/dark/assembly/armbot/TileEntityArmbot.java

@@ -38,7 +38,7 @@ import dark.core.helpers.MathHelper;
 import dark.core.interfaces.IMultiBlock;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.machine.BlockMulti;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, IArmbot, IPeripheral
 {

src/dark/assembly/client/gui/GuiTask.java

@@ -12,7 +12,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import dark.api.al.coding.IRedirectTask;
 import dark.api.al.coding.ITask;
 import dark.core.prefab.ModPrefab;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 @SideOnly(Side.CLIENT)
 public class GuiTask extends Gui

src/dark/assembly/imprinter/ItemImprinter.java

@@ -16,7 +16,7 @@ import net.minecraft.nbt.NBTTagList;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.assembly.AssemblyLine;
-import dark.machines.common.DMCreativeTab;
+import dark.core.DMCreativeTab;
 
 public class ItemImprinter extends Item
 {

src/dark/assembly/imprinter/TileEntityImprinter.java

@@ -34,7 +34,7 @@ import dark.core.helpers.AutoCraftingManager.IAutoCrafter;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.invgui.ISlotPickResult;
 import dark.core.prefab.machine.TileEntityMulti;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInventory, IArmbotUseable, IPacketReceiver, ISlotPickResult, IAutoCrafter
 {

src/dark/assembly/machine/BlockAssembly.java

@@ -6,9 +6,9 @@ import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import dark.assembly.AssemblyLine;
+import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DMCreativeTab;
 
 public class BlockAssembly extends BlockMachine
 {

src/dark/assembly/machine/TileEntityCrate.java

@@ -16,7 +16,7 @@ import cpw.mods.fml.relauncher.Side;
 import dark.api.IExtendedStorage;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.machine.TileEntityInv;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Basic single stack inventory
  * 

src/dark/assembly/machine/belt/BlockConveyor.java

@@ -24,7 +24,7 @@ import dark.assembly.machine.BlockAssembly;
 import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
 import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.prefab.tilenetwork.NetworkItemSupply;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class BlockConveyor extends BlockAssembly
 {

src/dark/assembly/machine/belt/BlockConveyorBelt.java

@@ -27,7 +27,7 @@ import dark.assembly.client.render.RenderConveyorBelt;
 import dark.assembly.machine.BlockAssembly;
 import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
 import dark.core.ModObjectRegistry.BlockBuildData;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** The block for the actual conveyor belt!
  * 

src/dark/assembly/machine/belt/TileEntityConveyorBelt.java

@@ -20,7 +20,7 @@ import dark.api.al.IBelt;
 import dark.assembly.ALRecipeLoader;
 import dark.assembly.machine.TileEntityAssembly;
 import dark.core.network.PacketHandler;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** Conveyer belt TileEntity that allows entities of all kinds to be moved
  * 

src/dark/assembly/machine/encoder/ItemDisk.java

@@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagList;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.assembly.AssemblyLine;
-import dark.machines.common.DMCreativeTab;
+import dark.core.DMCreativeTab;
 
 public class ItemDisk extends Item
 {

src/dark/assembly/machine/encoder/TileEntityEncoder.java

@@ -21,7 +21,7 @@ import dark.assembly.armbot.Program;
 import dark.assembly.armbot.command.TaskRotateTo;
 import dark.core.network.PacketHandler;
 import dark.core.prefab.machine.TileEntityMachine;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class TileEntityEncoder extends TileEntityMachine implements ISidedInventory
 {

src/dark/assembly/machine/frame/BlockFrame.java

@@ -13,7 +13,7 @@ import com.builtbroken.common.Pair;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 public class BlockFrame extends BlockMachine
 {

src/dark/assembly/machine/frame/TileEntityFrame.java

@@ -22,7 +22,7 @@ import dark.api.tilenetwork.ITileNetwork;
 import dark.core.interfaces.IBlockActivated;
 import dark.core.network.ISimplePacketReceiver;
 import dark.core.network.PacketHandler;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** A non-updating tileEntity that represents the logic behind the frame. It contains rotation and
  * connection information. As well provides a way for a tile network to be created to provide a

src/dark/assembly/machine/processor/BlockProcessor.java

@@ -25,9 +25,9 @@ import dark.assembly.AssemblyLine;
 import dark.assembly.CommonProxy;
 import dark.assembly.client.render.BlockRenderingHandler;
 import dark.assembly.client.render.RenderProcessor;
+import dark.core.DMCreativeTab;
 import dark.core.ModObjectRegistry.BlockBuildData;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DMCreativeTab;
 
 public class BlockProcessor extends BlockMachine
 {

src/dark/assembly/machine/red/BlockAdvancedHopper.java

@@ -20,8 +20,8 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import dark.assembly.AssemblyLine;
 import dark.assembly.client.render.RenderAdvancedHopper;
+import dark.core.DMCreativeTab;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DMCreativeTab;
 
 /** Block for an advanced version of the vanilla minecraft hopper
  * 

src/dark/assembly/machine/red/BlockPistonPlus.java

@@ -2,7 +2,7 @@ package dark.assembly.machine.red;
 
 import net.minecraft.block.material.Material;
 import dark.core.prefab.machine.BlockMachine;
-import dark.machines.common.DarkMain;
+import dark.machines.DarkMain;
 
 /** This will be a piston that can extend from 1 - 20 depending on teir and user settings
  *