Merge branch 'GTNewHorizons:master' into master

1 files changed, 0 insertions, 42 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java b/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java
deleted file mode 100644
index 9c1b231961..0000000000
--- a/src/Java/gtPlusPlus/api/objects/minecraft/GenericStack.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package gtPlusPlus.api.objects.minecraft;
-
-import net.minecraft.item.ItemStack;
-
-import net.minecraftforge.fluids.FluidStack;
-
-public class GenericStack {
-
-	private ItemStack mItemStack;
-	private FluidStack mFluidStack;
-	
-	public GenericStack(ItemStack s){
-		this.mItemStack = s;
-		this.mFluidStack = null;
-	}
-	
-	public GenericStack(FluidStack f){
-		this.mItemStack = null;
-		this.mFluidStack = f;
-	}
-	
-	public GenericStack() {
-		this.mItemStack = null;
-		this.mFluidStack = null;
-	}
-
-	public synchronized final FluidStack getFluidStack() {
-		return mFluidStack;
-	}
-
-	public synchronized final ItemStack getItemStack() {
-		return mItemStack;
-	}
-
-	public synchronized final void setItemStack(ItemStack mItemStack) {
-		this.mItemStack = mItemStack;
-	}
-
-	public synchronized final void setFluidStack(FluidStack mFluidStack) {
-		this.mFluidStack = mFluidStack;
-	}
-}