Merge branch 'master' of https://github.com/GTNewHorizons/GTplusplus into St00f

# Conflicts:
#	.gitignore
#	dependencies.gradle
#	src/main/java/gtPlusPlus/core/config/ConfigHandler.java
#	src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
#	src/main/resources/assets/miscutils/lang/en_US.lang

2 files changed, 0 insertions, 123 deletions

diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_Workbench.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_Workbench.java
deleted file mode 100644
index 861c2ba6b6..0000000000
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_Workbench.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package gtPlusPlus.core.gui.machine;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-import gtPlusPlus.core.container.Container_Workbench;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
-
-@SideOnly(Side.CLIENT)
-public class GUI_Workbench extends GuiContainer {
-
-	private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/BronzeCraftingTable.png");
-
-	public boolean moveItemsToChest = false;
-	public boolean moveItemsToCrafting = false;
-
-	public GUI_Workbench(final InventoryPlayer player_inventory, final TileEntityWorkbench tile){
-		super(new Container_Workbench(player_inventory, tile));
-	}
-
-
-	@Override
-	protected void drawGuiContainerForegroundLayer(final int i, final int j){
-		//this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752);
-		//this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
-
-	}
-
-
-	@Override
-	protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j){
-		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-		this.mc.renderEngine.bindTexture(craftingTableGuiTextures);
-		final int x = (this.width - this.xSize) / 2;
-		final int y = (this.height - this.ySize) / 2;
-		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
-	}
-
-
-	//This method is called when the Gui is first called!
-	@Override
-	public void initGui()
-	{
-		//You have to add this line for the Gui to function properly!
-		super.initGui();
-
-		//The parameters of GuiButton are(id, x, y, width, height, text);
-		//this.buttonList.add(new GuiButton( 1, 367, 132, 18, 18, "X"));
-		//this.buttonList.add(new GuiButton( 2, 385, 132, 18, 18, "Y"));
-		//NOTE: the id always has to be different or else it might get called twice or never!
-
-		//Add any other buttons here too!
-	}
-
-	@Override
-	protected void actionPerformed(final GuiButton B)
-	{
-		//If the button id is different, or you have mrs buttons, create another if block for that too!
-		if(B.id == 1){
-			System.out.println("Trying to empty crafting grid to the storage compartment.");
-			//moveItemsToChest = true;
-			((Container_Workbench) this.inventorySlots).moveCraftingToChest();
-		}
-		else if(B.id == 2){
-			System.out.println("Trying to move items into the crafting grid.");
-			//moveItemsToCrafting = true;
-			((Container_Workbench) this.inventorySlots).moveChestToCrafting();
-		}
-
-
-	}
-
-}
\ No newline at end of file
diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java
deleted file mode 100644
index 20183eb0b0..0000000000
--- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_WorkbenchAdvanced.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gtPlusPlus.core.gui.machine;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-
-import gtPlusPlus.core.container.Container_WorkbenchAdvanced;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
-
-@SideOnly(Side.CLIENT)
-public class GUI_WorkbenchAdvanced extends GuiContainer {
-
-	private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation(CORE.MODID, "textures/gui/AdvancedCraftingTable.png");
-
-	public GUI_WorkbenchAdvanced(final InventoryPlayer player_inventory, final TileEntityWorkbenchAdvanced tile){
-		super(new Container_WorkbenchAdvanced(player_inventory, tile));
-	}
-
-
-	@Override
-	protected void drawGuiContainerForegroundLayer(final int i, final int j){
-		//this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752);
-		//this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
-	}
-
-
-	@Override
-	protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j){
-		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-		this.mc.renderEngine.bindTexture(craftingTableGuiTextures);
-		final int x = (this.width - this.xSize) / 2;
-		final int y = (this.height - this.ySize) / 2;
-		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
-	}
-
-}
\ No newline at end of file