Merge branch '5.0.x' into 6.0.x

Conflicts:
	build.gradle
	common/buildcraft/transport/BlockGenericPipe.java
	common/buildcraft/transport/render/PipeItemRenderer.java

.gitignore

@@ -18,3 +18,6 @@ build
 
 #runtime
 run
+
+#mac
+.DS_Store

build.gradle

@@ -27,7 +27,7 @@ group= "com.mod-buildcraft"
 archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
 
 minecraft {
-    version = "1.7.2-10.12.1.1079" // McVersion-ForgeVersion     this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version.  Yeah its stupid, and will be changed eentually.
+    version = "1.7.10-10.13.0.1179" // McVersion-ForgeVersion     this variable is later changed to contain only the MC version, while the apiVersion variable is used for the forge version.  Yeah its stupid, and will be changed eentually.
 
     assetDir = "run/assets" // the place for ForgeGradle to download the assets. The assets that the launcher gets and stuff
 

common/buildcraft/core/gui/buttons/GuiToggleButton.java

@@ -31,7 +31,7 @@ public class GuiToggleButton extends GuiBetterButton {
 	}
 
 	@Override
-	protected int getHoverState(boolean mouseOver) {
+	public int getHoverState(boolean mouseOver) {
 		int state = 1;
 		if (!enabled) {
 			state = 0;

common/buildcraft/core/network/PacketNBT.java

@@ -13,6 +13,7 @@ import java.io.IOException;
 import io.netty.buffer.ByteBuf;
 
 import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTSizeTracker;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class PacketNBT extends PacketCoordinates {
@@ -50,7 +51,7 @@ public class PacketNBT extends PacketCoordinates {
 		data.readBytes(compressed);
 		
 		try {
-			this.nbttagcompound = CompressedStreamTools.decompress(compressed);
+			this.nbttagcompound = CompressedStreamTools.func_152457_a(compressed, NBTSizeTracker.field_152451_a);
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

common/buildcraft/core/utils/Utils.java

@@ -24,6 +24,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTSizeTracker;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
@@ -468,7 +469,7 @@ public final class Utils {
 			int length = data.readInt();
 			byte[] compressed = new byte[length];
 			data.readBytes(compressed);
-			return CompressedStreamTools.decompress(compressed);
+			return CompressedStreamTools.func_152457_a(compressed, NBTSizeTracker.field_152451_a);
 		} catch (IOException e) {
 			e.printStackTrace();
 			return null;

common/buildcraft/transport/render/PipeItemRenderer.java

@@ -26,7 +26,12 @@ import buildcraft.core.CoreConstants;
 public class PipeItemRenderer implements IItemRenderer {
 
 	private void renderPipeItem(RenderBlocks render, ItemStack item, float translateX, float translateY, float translateZ) {
-		
+
+		GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT); //don't break other mods' guis when holding a pipe
+		//force transparency
+		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+		GL11.glEnable(GL11.GL_BLEND);
+
 		GL11.glPushAttrib(GL11.GL_COLOR_BUFFER_BIT); //don't break other mods' guis when holding a pipe
 		//force transparency
 		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -74,8 +79,7 @@ public class PipeItemRenderer implements IItemRenderer {
 		GL11.glTranslatef(0.5F, 0.5F, 0.5F);
 		block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
 
-		GL11.glPopAttrib(); //nicely leave the rendering how it was
-		
+		GL11.glPopAttrib(); // nicely leave the rendering how it was
 	}
 
 	/**

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Feb 16 13:39:47 CST 2014
+#Tue May 06 21:57:37 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip