diff --git a/build.gradle b/build.gradle
index a0751409..cf4cefaa 100755
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,7 @@ apply plugin: 'forge' // adds the forge dependency
 apply plugin: 'maven' // for uploading to a maven repo
 apply plugin: 'checkstyle'
 
-version = "7.0.20"
+version = "7.0.21"
 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]
 
diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
index 2aa22ec2..b5f529ae 100644
--- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang
+++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
@@ -352,6 +352,7 @@ item.PipeFluidsQuartz.name=Quartz Fluid Pipe
 item.PipeFluidsGold.name=Golden Fluid Pipe
 item.PipeFluidsEmerald.name=Emerald Fluid Pipe
 item.PipeFluidsDiamond.name=Diamond Fluid Pipe
+item.PipeFluidsClay.name=Clay Fluid Pipe
 item.PipePowerWood.name=Wooden Kinesis Pipe
 item.PipePowerCobblestone.name=Cobblestone Kinesis Pipe
 item.PipePowerStone.name=Stone Kinesis Pipe
diff --git a/buildcraft_resources/changelog/7.0.21 b/buildcraft_resources/changelog/7.0.21
index 767c7481..66bfbb44 100644
--- a/buildcraft_resources/changelog/7.0.21
+++ b/buildcraft_resources/changelog/7.0.21
@@ -1,3 +1,10 @@
+Backported from 7.1:
+
+* Blueprint Library GUI improvements (asie)
+* Clay fluid pipe (asie)
+* Fluid pipe capacity scaling with fluidMultiplier (asie)
+* Zone Planner improvements (dynamic texture, zooming in) (asie)
+
 Bugs fixed:
 
 * [#2939] Quarry makes server crash when used and chunkloading is off in some cases (asie)
diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java
index 7c2b4f4d..9c6bfada 100644
--- a/common/buildcraft/builders/TileBlueprintLibrary.java
+++ b/common/buildcraft/builders/TileBlueprintLibrary.java
@@ -9,7 +9,6 @@
 package buildcraft.builders;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import io.netty.buffer.ByteBuf;
diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java
index 67091b7c..16e59d60 100644
--- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java
+++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java
@@ -14,7 +14,6 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
 
-import buildcraft.BuildCraftBuilders;
 import buildcraft.api.library.LibraryAPI;
 import buildcraft.builders.TileBlueprintLibrary;
 import buildcraft.core.DefaultProps;
diff --git a/common/buildcraft/builders/gui/GuiBuilder.java b/common/buildcraft/builders/gui/GuiBuilder.java
index 6e2ebbc8..9face15a 100644
--- a/common/buildcraft/builders/gui/GuiBuilder.java
+++ b/common/buildcraft/builders/gui/GuiBuilder.java
@@ -24,7 +24,6 @@ import buildcraft.core.blueprints.RequirementItemStack;
 import buildcraft.core.lib.fluids.Tank;
 import buildcraft.core.lib.gui.AdvancedSlot;
 import buildcraft.core.lib.gui.GuiAdvancedInterface;
-import buildcraft.core.lib.gui.widgets.ScrollbarWidget;
 import buildcraft.core.lib.network.command.CommandWriter;
 import buildcraft.core.lib.network.command.PacketCommand;
 import buildcraft.core.lib.render.FluidRenderer;
diff --git a/common/buildcraft/robotics/RoboticsProxyClient.java b/common/buildcraft/robotics/RoboticsProxyClient.java
index 1020695d..2f1fd5fe 100644
--- a/common/buildcraft/robotics/RoboticsProxyClient.java
+++ b/common/buildcraft/robotics/RoboticsProxyClient.java
@@ -14,8 +14,8 @@ import cpw.mods.fml.common.Loader;
 import net.minecraftforge.client.MinecraftForgeClient;
 
 import buildcraft.BuildCraftRobotics;
-import buildcraft.robotics.render.RenderZonePlan;
 import buildcraft.robotics.render.RenderRobot;
+import buildcraft.robotics.render.RenderZonePlan;
 import buildcraft.robotics.render.RobotStationItemRenderer;
 
 public class RoboticsProxyClient extends RoboticsProxy {