From 6a198ae3743e4d9a5b18e44e61afe2c1b3cecaee Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Mon, 1 Dec 2014 12:44:17 +0100
Subject: [PATCH 01/18] fix #2253, add missing Charging Table recipe

---
 common/buildcraft/BuildCraftSilicon.java         |  9 +++++++++
 .../core/statements/TriggerFluidContainer.java   |  8 ++++----
 .../statements/TriggerFluidContainerLevel.java   |  3 +++
 .../transport/pipes/PipePowerWood.java           | 16 ----------------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/common/buildcraft/BuildCraftSilicon.java b/common/buildcraft/BuildCraftSilicon.java
index f9ececc8..88fff813 100644
--- a/common/buildcraft/BuildCraftSilicon.java
+++ b/common/buildcraft/BuildCraftSilicon.java
@@ -249,6 +249,15 @@ public class BuildCraftSilicon extends BuildCraftMod {
 				'C', new ItemStack(redstoneChipset, 1, 0),
 				'G', "gearDiamond");
 
+		CoreProxy.proxy.addCraftingRecipe(new ItemStack(assemblyTableBlock, 1, 3),
+				"ORO",
+				"OCO",
+				"OGO",
+				'O', Blocks.obsidian,
+				'R', "dustRedstone",
+				'C', new ItemStack(redstoneChipset, 1, 0),
+				'G', "gearGold");
+
 		// COMMANDER BLOCKS
 		CoreProxy.proxy.addCraftingRecipe(new ItemStack(zonePlanBlock, 1, 0),
 				"IRI",
diff --git a/common/buildcraft/core/statements/TriggerFluidContainer.java b/common/buildcraft/core/statements/TriggerFluidContainer.java
index 7d3612ff..244be6ee 100644
--- a/common/buildcraft/core/statements/TriggerFluidContainer.java
+++ b/common/buildcraft/core/statements/TriggerFluidContainer.java
@@ -70,14 +70,14 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern
 			switch (state) {
 				case Empty:
 					for (FluidTankInfo c : liquids) {
-						if (c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
+						if (c != null && c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
 							return false;
 						}
 					}
 					return true;
 				case Contains:
 					for (FluidTankInfo c : liquids) {
-						if (c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
+						if (c != null && c.fluid != null && c.fluid.amount > 0 && (searchedFluid == null || searchedFluid.isFluidEqual(c.fluid))) {
 							return true;
 						}
 					}
@@ -85,7 +85,7 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern
 				case Space:
 					if (searchedFluid == null) {
 						for (FluidTankInfo c : liquids) {
-							if (c.fluid == null || c.fluid.amount < c.capacity) {
+							if (c != null && (c.fluid == null || c.fluid.amount < c.capacity)) {
 								return true;
 							}
 						}
@@ -95,7 +95,7 @@ public class TriggerFluidContainer extends BCStatement implements ITriggerExtern
 				case Full:
 					if (searchedFluid == null) {
 						for (FluidTankInfo c : liquids) {
-							if (c.fluid == null || c.fluid.amount < c.capacity) {
+							if (c != null && (c.fluid == null || c.fluid.amount < c.capacity)) {
 								return false;
 							}
 						}
diff --git a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java
index 14b54393..700c947d 100644
--- a/common/buildcraft/core/statements/TriggerFluidContainerLevel.java
+++ b/common/buildcraft/core/statements/TriggerFluidContainerLevel.java
@@ -74,6 +74,9 @@ public class TriggerFluidContainerLevel extends BCStatement implements ITriggerE
 			}
 
 			for (FluidTankInfo c : liquids) {
+				if (c == null) {
+					continue;
+				}
 				if (c.fluid == null) {
 					if (searchedFluid == null) {
 						return true;
diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java
index 541dee88..ff0ff12f 100644
--- a/common/buildcraft/transport/pipes/PipePowerWood.java
+++ b/common/buildcraft/transport/pipes/PipePowerWood.java
@@ -127,22 +127,6 @@ public class PipePowerWood extends Pipe<PipeTransportPower> implements IPipeTran
 		requestedEnergy = 0;
 	}
 
-	public boolean requestsPower() {
-		if (full) {
-			boolean request = battery.getEnergyStored() < battery.getMaxEnergyStored() / 2;
-
-			if (request) {
-				full = false;
-			}
-
-			return request;
-		}
-
-		full = battery.getEnergyStored() >= battery.getMaxEnergyStored() - 100;
-
-		return !full;
-	}
-
 	@Override
 	public void writeToNBT(NBTTagCompound data) {
 		super.writeToNBT(data);

From 1dc5a5bf5d756bdd88a5c456e1315ddf68cca6e2 Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Mon, 1 Dec 2014 12:54:34 +0100
Subject: [PATCH 02/18] fix #2257

---
 .../buildcraft/transport/PipeTransportPower.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java
index a826230f..54ce83aa 100644
--- a/common/buildcraft/transport/PipeTransportPower.java
+++ b/common/buildcraft/transport/PipeTransportPower.java
@@ -111,8 +111,18 @@ public class PipeTransportPower extends PipeTransport {
 	}
 
 	public boolean isPowerSource(TileEntity tile, ForgeDirection side) {
+		if (tile instanceof TileBuildCraft && !(tile instanceof IEngine)) {
+			// Disregard non-engine BC tiles.
+			// While this, of course, does nothing to work with other mods,
+			// it at least makes it work nicely with BC's built-in blocks while
+			// the new RF api isn't out.
+			return false;
+		}
+
+		return (tile instanceof IEnergyConnection && ((IEnergyConnection) tile).canConnectEnergy(side.getOpposite()));
+		// TODO: Look into this code again when the new RF API is out.
+		/*
 		if (tile instanceof IEnergyConnection && ((IEnergyConnection) tile).canConnectEnergy(side.getOpposite())) {
-			// TODO: Remove this hack! It's only done until Ender IO/MFR move to the new RF API
 			if (tile instanceof TileBuildCraft && !(tile instanceof IEngine)) {
 				// Disregard non-engine BC tiles
 				return false;
@@ -122,7 +132,7 @@ public class PipeTransportPower extends PipeTransport {
 		} else {
 			// Disregard tiles which can't connect either, I guess.
 			return false;
-		}
+		}*/
 	}
 
 	@Override

From 38e5b837fe7faa451d86d6f7a1f0913b3d3bbce6 Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Mon, 1 Dec 2014 12:57:33 +0100
Subject: [PATCH 03/18] fix #2256

---
 .../buildcraft/builders/TileConstructionMarker.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/buildcraft/builders/TileConstructionMarker.java b/common/buildcraft/builders/TileConstructionMarker.java
index 4c245726..0b6105b9 100755
--- a/common/buildcraft/builders/TileConstructionMarker.java
+++ b/common/buildcraft/builders/TileConstructionMarker.java
@@ -97,10 +97,14 @@ public class TileConstructionMarker extends TileBuildCraft implements IBuildingI
 		if (itemBlueprint != null && ItemBlueprint.getId(itemBlueprint) != null && bluePrintBuilder == null) {
 			BlueprintBase bpt = BlueprintBase.instantiate(itemBlueprint, worldObj, xCoord, yCoord, zCoord, direction);
 
-			bluePrintBuilder = new BptBuilderBlueprint((Blueprint) bpt, worldObj, xCoord, yCoord, zCoord);
-			bptContext = bluePrintBuilder.getContext();
-			box.initialize(bluePrintBuilder);
-			sendNetworkUpdate();
+			if (bpt instanceof Blueprint) {
+				bluePrintBuilder = new BptBuilderBlueprint((Blueprint) bpt, worldObj, xCoord, yCoord, zCoord);
+				bptContext = bluePrintBuilder.getContext();
+				box.initialize(bluePrintBuilder);
+				sendNetworkUpdate();
+			} else {
+				return;
+			}
 		}
 
 		if (laser == null && direction != ForgeDirection.UNKNOWN) {

From 63b1703e4ef91c0c60d5e163c3cf9807c3af39f1 Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Mon, 1 Dec 2014 22:10:37 +0100
Subject: [PATCH 04/18] BuildCraft 6.2.2

---
 build.gradle                                        | 2 +-
 buildcraft_resources/changelog/6.2.2                | 4 ++++
 buildcraft_resources/versions.txt                   | 2 +-
 common/buildcraft/transport/PipeTransportPower.java | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 buildcraft_resources/changelog/6.2.2

diff --git a/build.gradle b/build.gradle
index 3483cf84..6d1000b8 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 = "6.2.1"
+version = "6.2.2"
 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/changelog/6.2.2 b/buildcraft_resources/changelog/6.2.2
new file mode 100644
index 00000000..62c75e13
--- /dev/null
+++ b/buildcraft_resources/changelog/6.2.2
@@ -0,0 +1,4 @@
+Bugfixes:
+  * [#2257] Regression: some RF engines do not connect to wooden power pipes (asie)
+  * [#2253] NPE in fluid container checking can crash servers (asie)
+  * Added missing Charging Table recipe (asie)
diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt
index b5b9b891..4cc7e0fd 100755
--- a/buildcraft_resources/versions.txt
+++ b/buildcraft_resources/versions.txt
@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:6.2.1
+1.7.10:BuildCraft:6.2.2
diff --git a/common/buildcraft/transport/PipeTransportPower.java b/common/buildcraft/transport/PipeTransportPower.java
index 54ce83aa..97ca8233 100644
--- a/common/buildcraft/transport/PipeTransportPower.java
+++ b/common/buildcraft/transport/PipeTransportPower.java
@@ -119,7 +119,7 @@ public class PipeTransportPower extends PipeTransport {
 			return false;
 		}
 
-		return (tile instanceof IEnergyConnection && ((IEnergyConnection) tile).canConnectEnergy(side.getOpposite()));
+		return tile instanceof IEnergyConnection && ((IEnergyConnection) tile).canConnectEnergy(side.getOpposite());
 		// TODO: Look into this code again when the new RF API is out.
 		/*
 		if (tile instanceof IEnergyConnection && ((IEnergyConnection) tile).canConnectEnergy(side.getOpposite())) {

From b498bff9bddff2cb13a717cf5bdec61c7705ecdf Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 9 Dec 2014 18:17:05 +0100
Subject: [PATCH 05/18] fix #2271 and gate slot rcolor rendering bug

---
 common/buildcraft/core/gui/AdvancedSlot.java | 11 +++++++++++
 common/buildcraft/energy/TileEngineIron.java |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/common/buildcraft/core/gui/AdvancedSlot.java b/common/buildcraft/core/gui/AdvancedSlot.java
index 68f3386c..415144b7 100755
--- a/common/buildcraft/core/gui/AdvancedSlot.java
+++ b/common/buildcraft/core/gui/AdvancedSlot.java
@@ -8,6 +8,8 @@
  */
 package buildcraft.core.gui;
 
+import org.lwjgl.opengl.GL11;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.item.ItemStack;
@@ -88,7 +90,16 @@ public abstract class AdvancedSlot {
 		} else if (getIcon() != null) {
 			mc.renderEngine.bindTexture(getTexture());
 			//System.out.printf("Drawing advanced sprite %s (%d,%d) at %d %d\n", getIcon().getIconName(), getIcon().getOriginX(),getIcon().getOriginY(),cornerX + x, cornerY + y);
+
+			GL11.glDisable(GL11.GL_LIGHTING); // Make sure that render states are reset, an ItemStack can derp them up.
+			GL11.glEnable(GL11.GL_ALPHA_TEST);
+			GL11.glEnable(GL11.GL_BLEND);
+
 			gui.drawTexturedModelRectFromIcon(cornerX + x, cornerY + y, getIcon(), 16, 16);
+
+			GL11.glEnable(GL11.GL_LIGHTING);
+			GL11.glDisable(GL11.GL_ALPHA_TEST);
+			GL11.glDisable(GL11.GL_BLEND);
 		}
 
 	}
diff --git a/common/buildcraft/energy/TileEngineIron.java b/common/buildcraft/energy/TileEngineIron.java
index 8b409e86..3b91b31e 100644
--- a/common/buildcraft/energy/TileEngineIron.java
+++ b/common/buildcraft/energy/TileEngineIron.java
@@ -194,6 +194,9 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan
 
 	@Override
 	public void updateHeat() {
+		if (energyStage == EnergyStage.OVERHEAT && heat > MIN_HEAT) {
+			heat -= COOLDOWN_RATE;
+		}
 	}
 
 	@Override

From 47a09b3a2a9cb18bba3f938228d11e9e2977bbe0 Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 9 Dec 2014 19:39:38 +0100
Subject: [PATCH 06/18] fix #2274

---
 common/buildcraft/builders/TileBuilder.java   |  2 ++
 .../core/blueprints/BptBuilderBase.java       | 25 ++++++++-----------
 .../core/blueprints/BptBuilderBlueprint.java  |  7 ++----
 .../core/blueprints/BptBuilderTemplate.java   |  2 +-
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java
index 5d4b9661..7ef76469 100644
--- a/common/buildcraft/builders/TileBuilder.java
+++ b/common/buildcraft/builders/TileBuilder.java
@@ -722,6 +722,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
 	public void updateRequirements() {
 		ArrayList<ItemStack> reqCopy = null;
 		if (currentBuilder instanceof BptBuilderBlueprint) {
+			currentBuilder.initialize();
 			reqCopy = ((BptBuilderBlueprint) currentBuilder).neededItems;
 		}
 
@@ -733,6 +734,7 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
 	public void updateRequirements(EntityPlayer caller) {
 		ArrayList<ItemStack> reqCopy = null;
 		if (currentBuilder instanceof BptBuilderBlueprint) {
+			currentBuilder.initialize();
 			reqCopy = ((BptBuilderBlueprint) currentBuilder).neededItems;
 		}
 
diff --git a/common/buildcraft/core/blueprints/BptBuilderBase.java b/common/buildcraft/core/blueprints/BptBuilderBase.java
index 12c34065..aa836f3d 100644
--- a/common/buildcraft/core/blueprints/BptBuilderBase.java
+++ b/common/buildcraft/core/blueprints/BptBuilderBase.java
@@ -62,17 +62,21 @@ public abstract class BptBuilderBase implements IAreaProvider {
 		context = bluePrint.getContext(world, box);
 	}
 
-	protected abstract void initialize ();
+	public void initialize() {
+		if (!initialized) {
+			internalInit();
+			initialized = true;
+		}
+	}
+
+	protected abstract void internalInit();
 
 	protected abstract BuildingSlot reserveNextBlock(World world);
 
 	protected abstract BuildingSlot getNextBlock(World world, TileAbstractBuilder inv);
 
 	public boolean buildNextSlot(World world, TileAbstractBuilder builder, double x, double y, double z) {
-		if (!initialized) {
-			initialize();
-			initialized = true;
-		}
+		initialize();
 
 		if (world.getTotalWorldTime() < nextBuildDate) {
 			return false;
@@ -90,11 +94,7 @@ public abstract class BptBuilderBase implements IAreaProvider {
 
 	public boolean buildSlot(World world, IBuildingItemsProvider builder, BuildingSlot slot, double x, double y,
 			double z) {
-
-		if (!initialized) {
-			initialize();
-			initialized = true;
-		}
+		initialize();
 
 		if (slot != null) {
 			slot.built = true;
@@ -113,10 +113,7 @@ public abstract class BptBuilderBase implements IAreaProvider {
 	}
 
 	public BuildingSlot reserveNextSlot(World world) {
-		if (!initialized) {
-			initialize();
-			initialized = true;
-		}
+		initialize();
 
 		return reserveNextBlock(world);
 	}
diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java
index 70c270f6..29f19d20 100644
--- a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java
+++ b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java
@@ -69,7 +69,7 @@ public class BptBuilderBlueprint extends BptBuilderBase {
 	}
 
 	@Override
-	protected void initialize () {
+	protected void internalInit () {
 		for (int j = blueprint.sizeY - 1; j >= 0; --j) {
 			for (int i = 0; i < blueprint.sizeX; ++i) {
 				for (int k = 0; k < blueprint.sizeZ; ++k) {
@@ -192,10 +192,7 @@ public class BptBuilderBlueprint extends BptBuilderBase {
 	}
 
 	public void deploy () {
-		if (!initialized) {
-			initialize();
-			initialized = true;
-		}
+		initialize();
 
 		for (BuildingSlotBlock b : buildList) {
 			if (b.mode == Mode.ClearIfInvalid) {
diff --git a/common/buildcraft/core/blueprints/BptBuilderTemplate.java b/common/buildcraft/core/blueprints/BptBuilderTemplate.java
index 5d8eb35e..443c94c6 100644
--- a/common/buildcraft/core/blueprints/BptBuilderTemplate.java
+++ b/common/buildcraft/core/blueprints/BptBuilderTemplate.java
@@ -36,7 +36,7 @@ public class BptBuilderTemplate extends BptBuilderBase {
 	}
 
 	@Override
-	protected void initialize () {
+	protected void internalInit () {
 		if (blueprint.excavate) {
 			for (int j = blueprint.sizeY - 1; j >= 0; --j) {
 				for (int i = 0; i < blueprint.sizeX; ++i) {

From 016109efcf00f68e25d36f3f0eb0fc42164fda1f Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 9 Dec 2014 20:12:41 +0100
Subject: [PATCH 07/18] add configurable quarry chunkloading

---
 common/buildcraft/BuildCraftFactory.java  | 23 +++++--
 common/buildcraft/factory/TileQuarry.java | 84 +++++++++++------------
 2 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/common/buildcraft/BuildCraftFactory.java b/common/buildcraft/BuildCraftFactory.java
index 70a2d1c7..0aec9099 100644
--- a/common/buildcraft/BuildCraftFactory.java
+++ b/common/buildcraft/BuildCraftFactory.java
@@ -85,6 +85,7 @@ public class BuildCraftFactory extends BuildCraftMod {
 	public static BlockRefinery refineryBlock;
 	public static BlockHopper hopperBlock;
 
+	public static boolean quarryLoadsChunks = true;
 	public static boolean allowMining = true;
 	public static boolean quarryOneTimeUse = false;
 	public static float miningMultiplier = 1;
@@ -94,7 +95,9 @@ public class BuildCraftFactory extends BuildCraftMod {
 	@Mod.EventHandler
 	public void postInit(FMLPostInitializationEvent evt) {
 		FactoryProxy.proxy.initializeNEIIntegration();
-		ForgeChunkManager.setForcedChunkLoadingCallback(instance, new QuarryChunkloadCallback());
+		if (quarryLoadsChunks) {
+			ForgeChunkManager.setForcedChunkLoadingCallback(instance, new QuarryChunkloadCallback());
+		}
 	}
 
 	public class QuarryChunkloadCallback implements ForgeChunkManager.OrderedLoadingCallback {
@@ -105,9 +108,14 @@ public class BuildCraftFactory extends BuildCraftMod {
 				int quarryX = ticket.getModData().getInteger("quarryX");
 				int quarryY = ticket.getModData().getInteger("quarryY");
 				int quarryZ = ticket.getModData().getInteger("quarryZ");
-				TileQuarry tq = (TileQuarry) world.getTileEntity(quarryX, quarryY, quarryZ);
-				tq.forceChunkLoading(ticket);
 
+				if (world.blockExists(quarryX, quarryY, quarryZ)) {
+					Block block = world.getBlock(quarryX, quarryY, quarryZ);
+					if (block == quarryBlock) {
+						TileQuarry tq = (TileQuarry) world.getTileEntity(quarryX, quarryY, quarryZ);
+						tq.forceChunkLoading(ticket);
+					}
+				}
 			}
 		}
 
@@ -119,9 +127,11 @@ public class BuildCraftFactory extends BuildCraftMod {
 				int quarryY = ticket.getModData().getInteger("quarryY");
 				int quarryZ = ticket.getModData().getInteger("quarryZ");
 
-				Block block = world.getBlock(quarryX, quarryY, quarryZ);
-				if (block == quarryBlock) {
-					validTickets.add(ticket);
+				if (world.blockExists(quarryX, quarryY, quarryZ)) {
+					Block block = world.getBlock(quarryX, quarryY, quarryZ);
+					if (block == quarryBlock) {
+						validTickets.add(ticket);
+					}
 				}
 			}
 			return validTickets;
@@ -166,6 +176,7 @@ public class BuildCraftFactory extends BuildCraftMod {
 		quarryOneTimeUse = genCat.get("quarry.one.time.use", false, "Quarry cannot be picked back up after placement");
 		miningMultiplier = genCat.get("mining.cost.multipler", 1F, 1F, 10F, "cost multiplier for mining operations, range (1.0 - 10.0)\nhigh values may render engines incapable of powering machines directly");
 		miningDepth = genCat.get("mining.depth", 2, 256, 256, "how far below the machine can mining machines dig, range (2 - 256), default 256");
+		quarryLoadsChunks = genCat.get("quarry.loads.chunks", true, "Quarry loads chunks required for mining");
 
 		Property pumpList = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "pumping.controlList", DefaultProps.PUMP_DIMENSION_LIST);
 		pumpList.comment = "Allows admins to whitelist or blacklist pumping of specific fluids in specific dimensions.\n"
diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java
index 4cdd71fd..8e5a14b0 100644
--- a/common/buildcraft/factory/TileQuarry.java
+++ b/common/buildcraft/factory/TileQuarry.java
@@ -66,7 +66,6 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 	private double headPosX, headPosY, headPosZ;
 	private double speed = 0.03;
 	private Stage stage = Stage.BUILDING;
-	private boolean isAlive;
 	private boolean movingHorizontally;
 	private boolean movingVertically;
 	private double headTrajectory;
@@ -134,6 +133,18 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 		this.arm = arm;
 	}
 
+	public boolean areChunksLoaded() {
+		if (BuildCraftFactory.quarryLoadsChunks) {
+			// Small optimization
+			return true;
+		}
+
+		// Each chunk covers the full height, so we only check one of them per height.
+		return worldObj.blockExists(box.xMin, box.yMax, box.zMin)
+				&& worldObj.blockExists(box.xMax, box.yMax, box.zMin)
+				&& worldObj.blockExists(box.xMin, box.yMax, box.zMax)
+				&& worldObj.blockExists(box.xMax, box.yMax, box.zMax);
+	}
 	@Override
 	public void updateEntity() {
 		super.updateEntity();
@@ -146,11 +157,11 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 			return;
 		}
 
-		if (!isAlive) {
+		if (stage == Stage.DONE) {
 			return;
 		}
 
-		if (stage == Stage.DONE) {
+		if (!areChunksLoaded()) {
 			return;
 		}
 
@@ -453,7 +464,9 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 
 	@Override
 	public void invalidate() {
-		ForgeChunkManager.releaseTicket(chunkTicket);
+		if (chunkTicket != null) {
+			ForgeChunkManager.releaseTicket(chunkTicket);
+		}
 
 		super.invalidate();
 		destroy();
@@ -487,25 +500,15 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 	private void setBoundaries(boolean useDefaultI) {
 		boolean useDefault = useDefaultI;
 
-		if (chunkTicket == null) {
+		if (BuildCraftFactory.quarryLoadsChunks && chunkTicket == null) {
 			chunkTicket = ForgeChunkManager.requestTicket(BuildCraftFactory.instance, worldObj, Type.NORMAL);
 		}
-		if (chunkTicket == null) {
-			isAlive = false;
-
-			if (placedBy != null && !worldObj.isRemote) {
-				placedBy.addChatMessage(new ChatComponentText(
-						String.format(
-								"[BUILDCRAFT] The quarry at %d, %d, %d will not work because there are no more chunkloaders available",
-								xCoord, yCoord, zCoord)));
-			}
-			sendNetworkUpdate();
-			return;
+		if (chunkTicket != null) {
+			chunkTicket.getModData().setInteger("quarryX", xCoord);
+			chunkTicket.getModData().setInteger("quarryY", yCoord);
+			chunkTicket.getModData().setInteger("quarryZ", zCoord);
+			ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair(xCoord >> 4, zCoord >> 4));
 		}
-		chunkTicket.getModData().setInteger("quarryX", xCoord);
-		chunkTicket.getModData().setInteger("quarryY", yCoord);
-		chunkTicket.getModData().setInteger("quarryZ", zCoord);
-		ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair(xCoord >> 4, zCoord >> 4));
 
 		IAreaProvider a = null;
 
@@ -522,17 +525,19 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 		int xSize = a.xMax() - a.xMin() + 1;
 		int zSize = a.zMax() - a.zMin() + 1;
 
-		if (xSize < 3 || zSize < 3 || ((xSize * zSize) >> 8) >= chunkTicket.getMaxChunkListDepth()) {
-			if (placedBy != null) {
-				placedBy.addChatMessage(new ChatComponentText(
-						String.format(
-								"Quarry size is outside of chunkloading bounds or too small %d %d (%d)",
-								xSize, zSize,
-								chunkTicket.getMaxChunkListDepth())));
-			}
+		if (chunkTicket != null) {
+			if (xSize < 3 || zSize < 3 || ((xSize * zSize) >> 8) >= chunkTicket.getMaxChunkListDepth()) {
+				if (placedBy != null) {
+					placedBy.addChatMessage(new ChatComponentText(
+							String.format(
+									"Quarry size is outside of chunkloading bounds or too small %d %d (%d)",
+									xSize, zSize,
+									chunkTicket.getMaxChunkListDepth())));
+				}
 
-			a = new DefaultAreaProvider(xCoord, yCoord, zCoord, xCoord + 10, yCoord + 4, zCoord + 10);
-			useDefault = true;
+				a = new DefaultAreaProvider(xCoord, yCoord, zCoord, xCoord + 10, yCoord + 4, zCoord + 10);
+				useDefault = true;
+			}
 		}
 
 		xSize = a.xMax() - a.xMin() + 1;
@@ -575,7 +580,11 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 		}
 
 		a.removeFromWorld();
-		forceChunkLoading(chunkTicket);
+		if (chunkTicket != null) {
+			forceChunkLoading(chunkTicket);
+		}
+
+		sendNetworkUpdate();
 	}
 
 	private void initializeBlueprintBuilder() {
@@ -599,7 +608,6 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 		stream.writeFloat((float) speed);
 		stream.writeFloat((float) headTrajectory);
 		int flags = stage.ordinal();
-		flags |= isAlive ? 0x08 : 0;
 		flags |= movingHorizontally ? 0x10 : 0;
 		flags |= movingVertically ? 0x20 : 0;
 		stream.writeByte(flags);
@@ -619,16 +627,11 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 		headTrajectory = stream.readFloat();
 		int flags = stream.readUnsignedByte();
 		stage = Stage.values()[flags & 0x07];
-		isAlive = (flags & 0x08) != 0;
 		movingHorizontally = (flags & 0x10) != 0;
 		movingVertically = (flags & 0x20) != 0;
 
-		if (isAlive) {
-			createUtilsIfNeeded();
-		} else {
-			box.reset();
-			return;
-		}
+		createUtilsIfNeeded();
+
 		if (arm != null) {
 			arm.setHead(headPosX, headPosY, headPosZ);
 			arm.updatePosition();
@@ -802,7 +805,6 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 		}
 
 		Set<ChunkCoordIntPair> chunks = Sets.newHashSet();
-		isAlive = true;
 		ChunkCoordIntPair quarryChunk = new ChunkCoordIntPair(xCoord >> 4, zCoord >> 4);
 		chunks.add(quarryChunk);
 		ForgeChunkManager.forceChunk(ticket, quarryChunk);
@@ -821,8 +823,6 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 							"[BUILDCRAFT] The quarry at %d %d %d will keep %d chunks loaded",
 							xCoord, yCoord, zCoord, chunks.size())));
 		}
-
-		sendNetworkUpdate();
 	}
 
 	@Override

From 3dfb66ea86ea73c1c7fe5f091b995df98356ee56 Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 9 Dec 2014 20:34:05 +0100
Subject: [PATCH 08/18] fix quarries dropping a frame block

---
 common/buildcraft/factory/BlockFrame.java  |  7 ++++++-
 common/buildcraft/factory/BlockQuarry.java |  2 +-
 common/buildcraft/factory/TileQuarry.java  | 12 +++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/common/buildcraft/factory/BlockFrame.java b/common/buildcraft/factory/BlockFrame.java
index a32de6fe..16114c73 100644
--- a/common/buildcraft/factory/BlockFrame.java
+++ b/common/buildcraft/factory/BlockFrame.java
@@ -44,7 +44,11 @@ public class BlockFrame extends Block implements IFramePipeConnection {
 		if (world.isRemote) {
 			return;
 		}
-		
+
+		removeNeighboringFrames(world, x, y, z);
+	}
+
+	protected void removeNeighboringFrames(World world, int x, int y, int z) {
 		for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
 			Block nBlock = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
 			if (nBlock == this) {
@@ -52,6 +56,7 @@ public class BlockFrame extends Block implements IFramePipeConnection {
 			}
 		}
 	}
+
 	@Override
 	public boolean isOpaqueCube() {
 		return false;
diff --git a/common/buildcraft/factory/BlockQuarry.java b/common/buildcraft/factory/BlockQuarry.java
index 3f6bc4f1..60e152a3 100644
--- a/common/buildcraft/factory/BlockQuarry.java
+++ b/common/buildcraft/factory/BlockQuarry.java
@@ -145,7 +145,7 @@ public class BlockQuarry extends BlockBuildCraft {
 			return;
 		}
 
-		BuildCraftFactory.frameBlock.breakBlock(world, i, j, k, block, metadata);
+		BuildCraftFactory.frameBlock.removeNeighboringFrames(world, i, j, k);
 
 		super.breakBlock(world, i, j, k, block, metadata);
 	}
diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java
index 8e5a14b0..2bd08039 100644
--- a/common/buildcraft/factory/TileQuarry.java
+++ b/common/buildcraft/factory/TileQuarry.java
@@ -39,6 +39,7 @@ import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
 import buildcraft.core.CoreConstants;
 import buildcraft.core.DefaultAreaProvider;
+import buildcraft.core.IDropControlInventory;
 import buildcraft.core.blueprints.Blueprint;
 import buildcraft.core.blueprints.BptBuilderBase;
 import buildcraft.core.blueprints.BptBuilderBlueprint;
@@ -48,7 +49,7 @@ import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.BlockUtils;
 import buildcraft.core.utils.Utils;
 
-public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory {
+public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory, IDropControlInventory {
 
 	private static enum Stage {
 		BUILDING,
@@ -842,16 +843,21 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 
 	@Override
 	public int[] getAccessibleSlotsFromSide(int side) {
-		return new int[] {0};
+		return new int[] {};
 	}
 
 	@Override
 	public boolean canInsertItem(int p1, ItemStack p2, int p3) {
-		return true;
+		return false;
 	}
 
 	@Override
 	public boolean canExtractItem(int p1, ItemStack p2, int p3) {
 		return false;
 	}
+
+	@Override
+	public boolean doDrop() {
+		return false;
+	}
 }

From 5b650bf221b8176390afd1140cc57a990361d60d Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 9 Dec 2014 20:48:05 +0100
Subject: [PATCH 09/18] fix #2197

---
 .../stripes/StripesHandlerBucket.java         | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/common/buildcraft/transport/stripes/StripesHandlerBucket.java b/common/buildcraft/transport/stripes/StripesHandlerBucket.java
index 3b18a9e7..90cc3a7d 100644
--- a/common/buildcraft/transport/stripes/StripesHandlerBucket.java
+++ b/common/buildcraft/transport/stripes/StripesHandlerBucket.java
@@ -42,18 +42,31 @@ public class StripesHandlerBucket implements IStripesHandler {
 				pipe.sendItem(emptyBucket, direction.getOpposite());
 				
 				return true;
-			} else if (underblock instanceof IFluidBlock) {
-				Fluid fluid = ((IFluidBlock) underblock).getFluid();
-				FluidStack fluidStack = new FluidStack(fluid, 1000);
-				ItemStack filledBucket = FluidContainerRegistry.fillFluidContainer(fluidStack, emptyBucket);
+			} else {
+				ItemStack filledBucket = null;
+
+				if (underblock instanceof IFluidBlock) {
+					Fluid fluid = ((IFluidBlock) underblock).getFluid();
+					FluidStack fluidStack = new FluidStack(fluid, 1000);
+					filledBucket = FluidContainerRegistry.fillFluidContainer(fluidStack, emptyBucket);
+				}
+
+				if (underblock == Blocks.lava) {
+					filledBucket = new ItemStack(Items.lava_bucket, 1);
+				}
+
+				if (underblock == Blocks.water) {
+					filledBucket = new ItemStack(Items.water_bucket, 1);
+				}
+
 				if (filledBucket != null) {
 					world.setBlockToAir(x, y - 1, z);
-				
+
 					stack.stackSize = 0;
 					pipe.sendItem(filledBucket, direction.getOpposite());
+
+					return true;
 				}
-				
-				return true;
 			}
 
 			return false;

From 7c75a00976066eb9d6822705b708650feb39c756 Mon Sep 17 00:00:00 2001
From: asiekierka <asiekierka@gmail.com>
Date: Tue, 9 Dec 2014 21:09:14 +0100
Subject: [PATCH 10/18] relicense BuildCraft API to MIT, close #2248

---
 LICENSE                                       |  87 +++++++++
 LICENSE.API                                   |  22 +++
 LICENSE.CoFH                                  | 165 ++++++++++++++++++
 .../api/blueprints/BlueprintDeployer.java     |   6 +-
 api/buildcraft/api/blueprints/BuilderAPI.java |   8 +
 .../api/blueprints/BuildingPermission.java    |   6 +-
 .../api/blueprints/IBuilderContext.java       |   6 +-
 .../api/blueprints/ISchematicRegistry.java    |   8 +
 .../api/blueprints/ITileBuilder.java          |   6 +-
 .../blueprints/MappingNotFoundException.java  |   6 +-
 .../api/blueprints/MappingRegistry.java       |   6 +-
 api/buildcraft/api/blueprints/Schematic.java  |   6 +-
 .../api/blueprints/SchematicBlock.java        |   6 +-
 .../api/blueprints/SchematicBlockBase.java    |   6 +-
 .../api/blueprints/SchematicEntity.java       |   6 +-
 .../api/blueprints/SchematicFactory.java      |   6 +-
 .../api/blueprints/SchematicFluid.java        |   6 +-
 .../api/blueprints/SchematicMask.java         |   6 +-
 .../api/blueprints/SchematicTile.java         |   6 +-
 .../api/blueprints/Translation.java           |   6 +-
 .../api/blueprints/package-info.java          |   6 +-
 api/buildcraft/api/boards/IRedstoneBoard.java |   6 +-
 .../api/boards/RedstoneBoardNBT.java          |   6 +-
 .../api/boards/RedstoneBoardRegistry.java     |   6 +-
 .../api/boards/RedstoneBoardRobot.java        |   6 +-
 .../api/boards/RedstoneBoardRobotNBT.java     |   6 +-
 api/buildcraft/api/boards/package-info.java   |   6 +-
 api/buildcraft/api/core/BCLog.java            |   6 +-
 api/buildcraft/api/core/BlockIndex.java       |   6 +-
 api/buildcraft/api/core/BuildCraftAPI.java    |   6 +-
 api/buildcraft/api/core/EnumColor.java        |   6 +-
 api/buildcraft/api/core/IAreaProvider.java    |   6 +-
 api/buildcraft/api/core/IBox.java             |   6 +-
 api/buildcraft/api/core/ICoreProxy.java       |   6 +-
 api/buildcraft/api/core/IIconProvider.java    |   6 +-
 api/buildcraft/api/core/IInvSlot.java         |   6 +-
 api/buildcraft/api/core/ISerializable.java    |   6 +-
 api/buildcraft/api/core/IWorldProperty.java   |   6 +-
 api/buildcraft/api/core/IZone.java            |   6 +-
 api/buildcraft/api/core/JavaTools.java        |   6 +-
 api/buildcraft/api/core/Position.java         |   6 +-
 api/buildcraft/api/core/SafeTimeTracker.java  |   6 +-
 api/buildcraft/api/core/StackKey.java         |   6 +-
 api/buildcraft/api/core/WorldBlockIndex.java  |   6 +-
 api/buildcraft/api/core/package-info.java     |   6 +-
 .../api/events/BlockInteractionEvent.java     |   6 +-
 .../api/events/BlockPlacedDownEvent.java      |   6 +-
 .../api/events/PipePlacedEvent.java           |   6 +-
 .../api/events/RobotPlacementEvent.java       |   6 +-
 api/buildcraft/api/events/package-info.java   |   6 +-
 api/buildcraft/api/facades/FacadeType.java    |   8 +
 api/buildcraft/api/facades/IFacadeItem.java   |   8 +
 api/buildcraft/api/facades/package-info.java  |   6 +-
 api/buildcraft/api/filler/FillerManager.java  |   6 +-
 api/buildcraft/api/filler/IFillerPattern.java |   6 +-
 .../api/filler/IFillerRegistry.java           |   6 +-
 api/buildcraft/api/filler/package-info.java   |   6 +-
 .../api/fuels/BuildcraftFuelRegistry.java     |   6 +-
 api/buildcraft/api/fuels/ICoolant.java        |   6 +-
 api/buildcraft/api/fuels/ICoolantManager.java |   6 +-
 api/buildcraft/api/fuels/IFuel.java           |   6 +-
 api/buildcraft/api/fuels/IFuelManager.java    |   6 +-
 api/buildcraft/api/fuels/ISolidCoolant.java   |   6 +-
 api/buildcraft/api/fuels/package-info.java    |   6 +-
 .../api/gates/GateExpansionController.java    |   6 +-
 api/buildcraft/api/gates/GateExpansions.java  |   6 +-
 api/buildcraft/api/gates/IGate.java           |   6 +-
 api/buildcraft/api/gates/IGateExpansion.java  |   6 +-
 api/buildcraft/api/gates/package-info.java    |   6 +-
 api/buildcraft/api/package-info.java          |   6 +-
 api/buildcraft/api/power/IEngine.java         |   6 +-
 api/buildcraft/api/power/ILaserTarget.java    |   6 +-
 .../api/power/ILaserTargetBlock.java          |   6 +-
 api/buildcraft/api/power/package-info.java    |   8 +
 .../api/recipes/BuildcraftRecipeRegistry.java |   6 +-
 .../api/recipes/CraftingResult.java           |   6 +-
 .../api/recipes/IAssemblyRecipeManager.java   |   6 +-
 .../api/recipes/IFlexibleCrafter.java         |   6 +-
 .../api/recipes/IFlexibleRecipe.java          |   6 +-
 .../api/recipes/IFlexibleRecipeViewable.java  |   8 +
 .../api/recipes/IIntegrationRecipe.java       |   6 +-
 .../recipes/IIntegrationRecipeManager.java    |   6 +-
 .../api/recipes/IRefineryRecipeManager.java   |   6 +-
 api/buildcraft/api/recipes/package-info.java  |   6 +-
 api/buildcraft/api/robots/AIRobot.java        |   6 +-
 .../api/robots/EntityRobotBase.java           |   6 +-
 .../api/robots/IDockingStation.java           |   6 +-
 .../api/robots/IRequestProvider.java          |   6 +-
 api/buildcraft/api/robots/IRobotRegistry.java |   6 +-
 api/buildcraft/api/robots/ResourceId.java     |   6 +-
 api/buildcraft/api/robots/StackRequest.java   |   6 +-
 api/buildcraft/api/robots/package-info.java   |   6 +-
 .../api/statements/ActionState.java           |   6 +-
 .../api/statements/IActionExternal.java       |   6 +-
 .../api/statements/IActionInternal.java       |   6 +-
 .../api/statements/IActionProvider.java       |   6 +-
 .../api/statements/IActionReceptor.java       |   6 +-
 .../IOverrideDefaultStatements.java           |   6 +-
 api/buildcraft/api/statements/IStatement.java |   6 +-
 .../api/statements/IStatementContainer.java   |   6 +-
 .../api/statements/IStatementParameter.java   |   6 +-
 .../api/statements/ITriggerExternal.java      |   6 +-
 .../api/statements/ITriggerInternal.java      |   6 +-
 .../api/statements/ITriggerProvider.java      |   6 +-
 .../api/statements/StatementManager.java      |   6 +-
 .../api/statements/StatementMouseClick.java   |   6 +-
 .../StatementParameterItemStack.java          |   6 +-
 .../api/statements/package-info.java          |   6 +-
 api/buildcraft/api/tiles/IControllable.java   |   6 +-
 api/buildcraft/api/tiles/IHasWork.java        |   6 +-
 api/buildcraft/api/tiles/IHeatable.java       |   6 +-
 api/buildcraft/api/tiles/package-info.java    |   6 +-
 api/buildcraft/api/tools/IToolWrench.java     |   6 +-
 api/buildcraft/api/tools/package-info.java    |   6 +-
 .../api/transport/IExtractionHandler.java     |   6 +-
 api/buildcraft/api/transport/IPipe.java       |   6 +-
 .../api/transport/IPipeConnection.java        |   6 +-
 .../api/transport/IPipePluggable.java         |   6 +-
 api/buildcraft/api/transport/IPipeTile.java   |   6 +-
 .../api/transport/IStripesHandler.java        |   8 +
 .../api/transport/IStripesPipe.java           |   8 +
 api/buildcraft/api/transport/PipeManager.java |   6 +-
 api/buildcraft/api/transport/PipeWire.java    |   6 +-
 .../api/transport/package-info.java           |   6 +-
 124 files changed, 677 insertions(+), 339 deletions(-)
 create mode 100644 LICENSE
 create mode 100644 LICENSE.API
 create mode 100644 LICENSE.CoFH

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..a445a6fb
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,87 @@
+Minecraft Mod Public License
+============================
+
+Version 1.0.1
+
+0. Definitions
+--------------
+
+Minecraft: Denotes a copy of the Minecraft game licensed by Mojang AB
+
+User: Anybody that interacts with the software in one of the following ways:
+   - play
+   - decompile
+   - recompile or compile
+   - modify
+   - distribute
+
+Mod: The mod code designated by the present license, in source form, binary
+form, as obtained standalone, as part of a wider distribution or resulting from
+the compilation of the original or modified sources.
+
+Dependency: Code required for the mod to work properly. This includes 
+dependencies required to compile the code as well as any file or modification
+that is explicitely or implicitely required for the mod to be working.
+
+1. Scope
+--------
+
+The present license is granted to any user of the mod. As a prerequisite, 
+a user must own a legally acquired copy of Minecraft
+
+2. Liability
+------------
+
+This mod is provided 'as is' with no warranties, implied or otherwise. The owner
+of this mod takes no responsibility for any damages incurred from the use of
+this mod. This mod alters fundamental parts of the Minecraft game, parts of
+Minecraft may not work with this mod installed. All damages caused from the use
+or misuse of this mad fall on the user.
+
+3. Play rights
+--------------
+
+The user is allowed to install this mod on a client or a server and to play 
+without restriction.
+
+4. Modification rights
+----------------------
+
+The user has the right to decompile the source code, look at either the 
+decompiled version or the original source code, and to modify it.
+
+5. Derivation rights
+--------------------
+
+The user has the rights to derive code from this mod, that is to say to
+write code that extends or instanciate the mod classes or interfaces, refer to
+its objects, or calls its functions. This code is known as "derived" code, and 
+can be licensed under a license different from this mod.
+
+6. Distribution of original or modified copy rights
+---------------------------------------------------
+
+Is subject to distribution rights this entire mod in its various forms. This
+include:
+   - original binary or source forms of this mod files
+   - modified versions of these binaries or source files, as well as binaries
+     resulting from source modifications
+   - patch to its source or binary files
+   - any copy of a portion of its binary source files
+
+The user is allowed to redistribute this mod partially, in totality, or 
+included in a distribution.
+
+When distributing binary files, the user must provide means to obtain its 
+entire set of sources or modified sources at no costs.
+
+All distributions of this mod must remain licensed under the MMPL.
+
+All dependencies that this mod have on other mods or classes must be licensed
+under conditions comparable to this version of MMPL, with the exception of the
+Minecraft code and the mod loading framework (e.g. ModLoader, ModLoaderMP or
+Bukkit).
+
+Modified version of binaries and sources, as well as files containing sections
+copied from this mod, should be distributed under the terms of the present
+license.
diff --git a/LICENSE.API b/LICENSE.API
new file mode 100644
index 00000000..017c1bb2
--- /dev/null
+++ b/LICENSE.API
@@ -0,0 +1,22 @@
+BuildCraft API License
+
+Copyright (c) 2011-2014 SpaceToad and the BuildCraft team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/LICENSE.CoFH b/LICENSE.CoFH
new file mode 100644
index 00000000..65c5ca88
--- /dev/null
+++ b/LICENSE.CoFH
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/api/buildcraft/api/blueprints/BlueprintDeployer.java b/api/buildcraft/api/blueprints/BlueprintDeployer.java
index 044db825..20dcb345 100755
--- a/api/buildcraft/api/blueprints/BlueprintDeployer.java
+++ b/api/buildcraft/api/blueprints/BlueprintDeployer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/BuilderAPI.java b/api/buildcraft/api/blueprints/BuilderAPI.java
index 62a0a78d..c10d5f60 100644
--- a/api/buildcraft/api/blueprints/BuilderAPI.java
+++ b/api/buildcraft/api/blueprints/BuilderAPI.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 package buildcraft.api.blueprints;
 
 public final class BuilderAPI {
diff --git a/api/buildcraft/api/blueprints/BuildingPermission.java b/api/buildcraft/api/blueprints/BuildingPermission.java
index c325bff4..c6850692 100755
--- a/api/buildcraft/api/blueprints/BuildingPermission.java
+++ b/api/buildcraft/api/blueprints/BuildingPermission.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/IBuilderContext.java b/api/buildcraft/api/blueprints/IBuilderContext.java
index 4f5a5871..a1f9cbad 100644
--- a/api/buildcraft/api/blueprints/IBuilderContext.java
+++ b/api/buildcraft/api/blueprints/IBuilderContext.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/ISchematicRegistry.java b/api/buildcraft/api/blueprints/ISchematicRegistry.java
index 6c4dd416..f28fd4a4 100644
--- a/api/buildcraft/api/blueprints/ISchematicRegistry.java
+++ b/api/buildcraft/api/blueprints/ISchematicRegistry.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 package buildcraft.api.blueprints;
 
 import net.minecraft.block.Block;
diff --git a/api/buildcraft/api/blueprints/ITileBuilder.java b/api/buildcraft/api/blueprints/ITileBuilder.java
index 0afb93a9..6135469e 100755
--- a/api/buildcraft/api/blueprints/ITileBuilder.java
+++ b/api/buildcraft/api/blueprints/ITileBuilder.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/MappingNotFoundException.java b/api/buildcraft/api/blueprints/MappingNotFoundException.java
index 4403a075..d9bd7448 100755
--- a/api/buildcraft/api/blueprints/MappingNotFoundException.java
+++ b/api/buildcraft/api/blueprints/MappingNotFoundException.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/MappingRegistry.java b/api/buildcraft/api/blueprints/MappingRegistry.java
index 6d087e90..bf1efe96 100755
--- a/api/buildcraft/api/blueprints/MappingRegistry.java
+++ b/api/buildcraft/api/blueprints/MappingRegistry.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/Schematic.java b/api/buildcraft/api/blueprints/Schematic.java
index 1869befc..76aa852c 100755
--- a/api/buildcraft/api/blueprints/Schematic.java
+++ b/api/buildcraft/api/blueprints/Schematic.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/SchematicBlock.java b/api/buildcraft/api/blueprints/SchematicBlock.java
index a9338f89..28910632 100755
--- a/api/buildcraft/api/blueprints/SchematicBlock.java
+++ b/api/buildcraft/api/blueprints/SchematicBlock.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/SchematicBlockBase.java b/api/buildcraft/api/blueprints/SchematicBlockBase.java
index a8964978..3693c707 100755
--- a/api/buildcraft/api/blueprints/SchematicBlockBase.java
+++ b/api/buildcraft/api/blueprints/SchematicBlockBase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/SchematicEntity.java b/api/buildcraft/api/blueprints/SchematicEntity.java
index bddfd842..4f902728 100755
--- a/api/buildcraft/api/blueprints/SchematicEntity.java
+++ b/api/buildcraft/api/blueprints/SchematicEntity.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/SchematicFactory.java b/api/buildcraft/api/blueprints/SchematicFactory.java
index b8f35024..b6052a8e 100755
--- a/api/buildcraft/api/blueprints/SchematicFactory.java
+++ b/api/buildcraft/api/blueprints/SchematicFactory.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/SchematicFluid.java b/api/buildcraft/api/blueprints/SchematicFluid.java
index 304f56eb..d168a680 100644
--- a/api/buildcraft/api/blueprints/SchematicFluid.java
+++ b/api/buildcraft/api/blueprints/SchematicFluid.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/SchematicMask.java b/api/buildcraft/api/blueprints/SchematicMask.java
index 739445d3..7d737d2d 100755
--- a/api/buildcraft/api/blueprints/SchematicMask.java
+++ b/api/buildcraft/api/blueprints/SchematicMask.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/SchematicTile.java b/api/buildcraft/api/blueprints/SchematicTile.java
index 86a9dd42..2daec51b 100755
--- a/api/buildcraft/api/blueprints/SchematicTile.java
+++ b/api/buildcraft/api/blueprints/SchematicTile.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/Translation.java b/api/buildcraft/api/blueprints/Translation.java
index 628dbb18..b086492b 100755
--- a/api/buildcraft/api/blueprints/Translation.java
+++ b/api/buildcraft/api/blueprints/Translation.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.blueprints;
 
diff --git a/api/buildcraft/api/blueprints/package-info.java b/api/buildcraft/api/blueprints/package-info.java
index 4b75bbb1..12cfc7df 100644
--- a/api/buildcraft/api/blueprints/package-info.java
+++ b/api/buildcraft/api/blueprints/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|blueprints")
 package buildcraft.api.blueprints;
diff --git a/api/buildcraft/api/boards/IRedstoneBoard.java b/api/buildcraft/api/boards/IRedstoneBoard.java
index a65322e6..d9e165ea 100755
--- a/api/buildcraft/api/boards/IRedstoneBoard.java
+++ b/api/buildcraft/api/boards/IRedstoneBoard.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.boards;
 
diff --git a/api/buildcraft/api/boards/RedstoneBoardNBT.java b/api/buildcraft/api/boards/RedstoneBoardNBT.java
index 70c1c7c8..c94b0cdb 100755
--- a/api/buildcraft/api/boards/RedstoneBoardNBT.java
+++ b/api/buildcraft/api/boards/RedstoneBoardNBT.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.boards;
 
diff --git a/api/buildcraft/api/boards/RedstoneBoardRegistry.java b/api/buildcraft/api/boards/RedstoneBoardRegistry.java
index 0c4d5bb9..6c299bcf 100755
--- a/api/buildcraft/api/boards/RedstoneBoardRegistry.java
+++ b/api/buildcraft/api/boards/RedstoneBoardRegistry.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.boards;
 
diff --git a/api/buildcraft/api/boards/RedstoneBoardRobot.java b/api/buildcraft/api/boards/RedstoneBoardRobot.java
index cdfaa592..6f87ea52 100755
--- a/api/buildcraft/api/boards/RedstoneBoardRobot.java
+++ b/api/buildcraft/api/boards/RedstoneBoardRobot.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.boards;
 
diff --git a/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java b/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java
index af9a8ec5..595a6c5d 100755
--- a/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java
+++ b/api/buildcraft/api/boards/RedstoneBoardRobotNBT.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.boards;
 
diff --git a/api/buildcraft/api/boards/package-info.java b/api/buildcraft/api/boards/package-info.java
index ad428d7f..ccaa82d9 100644
--- a/api/buildcraft/api/boards/package-info.java
+++ b/api/buildcraft/api/boards/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|boards")
 package buildcraft.api.boards;
diff --git a/api/buildcraft/api/core/BCLog.java b/api/buildcraft/api/core/BCLog.java
index 4e5eada5..2ccf2bd5 100644
--- a/api/buildcraft/api/core/BCLog.java
+++ b/api/buildcraft/api/core/BCLog.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/BlockIndex.java b/api/buildcraft/api/core/BlockIndex.java
index 87599bfa..0b898512 100644
--- a/api/buildcraft/api/core/BlockIndex.java
+++ b/api/buildcraft/api/core/BlockIndex.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/BuildCraftAPI.java b/api/buildcraft/api/core/BuildCraftAPI.java
index ce99d7ce..de1933e9 100644
--- a/api/buildcraft/api/core/BuildCraftAPI.java
+++ b/api/buildcraft/api/core/BuildCraftAPI.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/EnumColor.java b/api/buildcraft/api/core/EnumColor.java
index 1db68c6b..bdc94fcc 100644
--- a/api/buildcraft/api/core/EnumColor.java
+++ b/api/buildcraft/api/core/EnumColor.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/IAreaProvider.java b/api/buildcraft/api/core/IAreaProvider.java
index c0179caa..92bd4d6a 100644
--- a/api/buildcraft/api/core/IAreaProvider.java
+++ b/api/buildcraft/api/core/IAreaProvider.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/IBox.java b/api/buildcraft/api/core/IBox.java
index 9b279878..c839c65b 100644
--- a/api/buildcraft/api/core/IBox.java
+++ b/api/buildcraft/api/core/IBox.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/ICoreProxy.java b/api/buildcraft/api/core/ICoreProxy.java
index b5132df9..b3b5767c 100755
--- a/api/buildcraft/api/core/ICoreProxy.java
+++ b/api/buildcraft/api/core/ICoreProxy.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/IIconProvider.java b/api/buildcraft/api/core/IIconProvider.java
index 2734415d..09aa7009 100644
--- a/api/buildcraft/api/core/IIconProvider.java
+++ b/api/buildcraft/api/core/IIconProvider.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/IInvSlot.java b/api/buildcraft/api/core/IInvSlot.java
index ec4918ce..1219f640 100644
--- a/api/buildcraft/api/core/IInvSlot.java
+++ b/api/buildcraft/api/core/IInvSlot.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/ISerializable.java b/api/buildcraft/api/core/ISerializable.java
index 49431f25..9875e341 100644
--- a/api/buildcraft/api/core/ISerializable.java
+++ b/api/buildcraft/api/core/ISerializable.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/IWorldProperty.java b/api/buildcraft/api/core/IWorldProperty.java
index 4a900c62..669b2440 100755
--- a/api/buildcraft/api/core/IWorldProperty.java
+++ b/api/buildcraft/api/core/IWorldProperty.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/IZone.java b/api/buildcraft/api/core/IZone.java
index a34bfd12..2eee45ea 100755
--- a/api/buildcraft/api/core/IZone.java
+++ b/api/buildcraft/api/core/IZone.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/JavaTools.java b/api/buildcraft/api/core/JavaTools.java
index 1566951b..d522997c 100755
--- a/api/buildcraft/api/core/JavaTools.java
+++ b/api/buildcraft/api/core/JavaTools.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/Position.java b/api/buildcraft/api/core/Position.java
index 5b642c67..b76377fb 100644
--- a/api/buildcraft/api/core/Position.java
+++ b/api/buildcraft/api/core/Position.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/SafeTimeTracker.java b/api/buildcraft/api/core/SafeTimeTracker.java
index 9b60b86e..c55fc24b 100644
--- a/api/buildcraft/api/core/SafeTimeTracker.java
+++ b/api/buildcraft/api/core/SafeTimeTracker.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/StackKey.java b/api/buildcraft/api/core/StackKey.java
index 092c173f..a06827fc 100644
--- a/api/buildcraft/api/core/StackKey.java
+++ b/api/buildcraft/api/core/StackKey.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/WorldBlockIndex.java b/api/buildcraft/api/core/WorldBlockIndex.java
index aedbeaf5..77379969 100755
--- a/api/buildcraft/api/core/WorldBlockIndex.java
+++ b/api/buildcraft/api/core/WorldBlockIndex.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.core;
 
diff --git a/api/buildcraft/api/core/package-info.java b/api/buildcraft/api/core/package-info.java
index fe3c5241..d7bee0dc 100644
--- a/api/buildcraft/api/core/package-info.java
+++ b/api/buildcraft/api/core/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.2", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core")
 package buildcraft.api.core;
diff --git a/api/buildcraft/api/events/BlockInteractionEvent.java b/api/buildcraft/api/events/BlockInteractionEvent.java
index 2dad33e4..795a6b48 100644
--- a/api/buildcraft/api/events/BlockInteractionEvent.java
+++ b/api/buildcraft/api/events/BlockInteractionEvent.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.events;
 
diff --git a/api/buildcraft/api/events/BlockPlacedDownEvent.java b/api/buildcraft/api/events/BlockPlacedDownEvent.java
index 80b74f3a..4d7072eb 100644
--- a/api/buildcraft/api/events/BlockPlacedDownEvent.java
+++ b/api/buildcraft/api/events/BlockPlacedDownEvent.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.events;
 
diff --git a/api/buildcraft/api/events/PipePlacedEvent.java b/api/buildcraft/api/events/PipePlacedEvent.java
index 5c59c250..53f907c2 100644
--- a/api/buildcraft/api/events/PipePlacedEvent.java
+++ b/api/buildcraft/api/events/PipePlacedEvent.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.events;
 
diff --git a/api/buildcraft/api/events/RobotPlacementEvent.java b/api/buildcraft/api/events/RobotPlacementEvent.java
index 44dd8bc9..4f9525a7 100644
--- a/api/buildcraft/api/events/RobotPlacementEvent.java
+++ b/api/buildcraft/api/events/RobotPlacementEvent.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.events;
 
diff --git a/api/buildcraft/api/events/package-info.java b/api/buildcraft/api/events/package-info.java
index bdaacd45..680e346c 100644
--- a/api/buildcraft/api/events/package-info.java
+++ b/api/buildcraft/api/events/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|events")
 package buildcraft.api.events;
diff --git a/api/buildcraft/api/facades/FacadeType.java b/api/buildcraft/api/facades/FacadeType.java
index 6e8211df..3da47c39 100644
--- a/api/buildcraft/api/facades/FacadeType.java
+++ b/api/buildcraft/api/facades/FacadeType.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 package buildcraft.api.facades;
 
 public enum FacadeType {
diff --git a/api/buildcraft/api/facades/IFacadeItem.java b/api/buildcraft/api/facades/IFacadeItem.java
index 819ab338..5237601b 100644
--- a/api/buildcraft/api/facades/IFacadeItem.java
+++ b/api/buildcraft/api/facades/IFacadeItem.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 package buildcraft.api.facades;
 
 import net.minecraft.block.Block;
diff --git a/api/buildcraft/api/facades/package-info.java b/api/buildcraft/api/facades/package-info.java
index bf6bdb7d..a4186f2e 100644
--- a/api/buildcraft/api/facades/package-info.java
+++ b/api/buildcraft/api/facades/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|facades")
 package buildcraft.api.facades;
diff --git a/api/buildcraft/api/filler/FillerManager.java b/api/buildcraft/api/filler/FillerManager.java
index bf709713..f25f80e1 100644
--- a/api/buildcraft/api/filler/FillerManager.java
+++ b/api/buildcraft/api/filler/FillerManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.filler;
 
diff --git a/api/buildcraft/api/filler/IFillerPattern.java b/api/buildcraft/api/filler/IFillerPattern.java
index 09d55d40..9827db41 100644
--- a/api/buildcraft/api/filler/IFillerPattern.java
+++ b/api/buildcraft/api/filler/IFillerPattern.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.filler;
 
diff --git a/api/buildcraft/api/filler/IFillerRegistry.java b/api/buildcraft/api/filler/IFillerRegistry.java
index 3b91d244..7fd72be2 100644
--- a/api/buildcraft/api/filler/IFillerRegistry.java
+++ b/api/buildcraft/api/filler/IFillerRegistry.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.filler;
 
diff --git a/api/buildcraft/api/filler/package-info.java b/api/buildcraft/api/filler/package-info.java
index e801334a..1e630fdd 100644
--- a/api/buildcraft/api/filler/package-info.java
+++ b/api/buildcraft/api/filler/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|filler")
 package buildcraft.api.filler;
diff --git a/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java b/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java
index eda676eb..8d08873e 100644
--- a/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java
+++ b/api/buildcraft/api/fuels/BuildcraftFuelRegistry.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.fuels;
 
diff --git a/api/buildcraft/api/fuels/ICoolant.java b/api/buildcraft/api/fuels/ICoolant.java
index fd0e6d4d..15302bdc 100644
--- a/api/buildcraft/api/fuels/ICoolant.java
+++ b/api/buildcraft/api/fuels/ICoolant.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.fuels;
 
diff --git a/api/buildcraft/api/fuels/ICoolantManager.java b/api/buildcraft/api/fuels/ICoolantManager.java
index 6e29c15c..2ed5c00a 100644
--- a/api/buildcraft/api/fuels/ICoolantManager.java
+++ b/api/buildcraft/api/fuels/ICoolantManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.fuels;
 
diff --git a/api/buildcraft/api/fuels/IFuel.java b/api/buildcraft/api/fuels/IFuel.java
index c3e29280..4b724bea 100644
--- a/api/buildcraft/api/fuels/IFuel.java
+++ b/api/buildcraft/api/fuels/IFuel.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.fuels;
 
diff --git a/api/buildcraft/api/fuels/IFuelManager.java b/api/buildcraft/api/fuels/IFuelManager.java
index 50ac9341..48f2de57 100644
--- a/api/buildcraft/api/fuels/IFuelManager.java
+++ b/api/buildcraft/api/fuels/IFuelManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.fuels;
 
diff --git a/api/buildcraft/api/fuels/ISolidCoolant.java b/api/buildcraft/api/fuels/ISolidCoolant.java
index 69e4871e..7604cec0 100644
--- a/api/buildcraft/api/fuels/ISolidCoolant.java
+++ b/api/buildcraft/api/fuels/ISolidCoolant.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.fuels;
 
diff --git a/api/buildcraft/api/fuels/package-info.java b/api/buildcraft/api/fuels/package-info.java
index fe46ec34..08a01258 100644
--- a/api/buildcraft/api/fuels/package-info.java
+++ b/api/buildcraft/api/fuels/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|fuels")
 package buildcraft.api.fuels;
diff --git a/api/buildcraft/api/gates/GateExpansionController.java b/api/buildcraft/api/gates/GateExpansionController.java
index 5a9eca25..2a9c8d59 100644
--- a/api/buildcraft/api/gates/GateExpansionController.java
+++ b/api/buildcraft/api/gates/GateExpansionController.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.gates;
 
diff --git a/api/buildcraft/api/gates/GateExpansions.java b/api/buildcraft/api/gates/GateExpansions.java
index c94b9b72..1edb2e42 100644
--- a/api/buildcraft/api/gates/GateExpansions.java
+++ b/api/buildcraft/api/gates/GateExpansions.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.gates;
 
diff --git a/api/buildcraft/api/gates/IGate.java b/api/buildcraft/api/gates/IGate.java
index 2018cb44..2d173833 100644
--- a/api/buildcraft/api/gates/IGate.java
+++ b/api/buildcraft/api/gates/IGate.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.gates;
 
diff --git a/api/buildcraft/api/gates/IGateExpansion.java b/api/buildcraft/api/gates/IGateExpansion.java
index 361f0a4d..4c51f040 100644
--- a/api/buildcraft/api/gates/IGateExpansion.java
+++ b/api/buildcraft/api/gates/IGateExpansion.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.gates;
 
diff --git a/api/buildcraft/api/gates/package-info.java b/api/buildcraft/api/gates/package-info.java
index 067e6edc..a5277c6d 100644
--- a/api/buildcraft/api/gates/package-info.java
+++ b/api/buildcraft/api/gates/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|gates")
 package buildcraft.api.gates;
diff --git a/api/buildcraft/api/package-info.java b/api/buildcraft/api/package-info.java
index d7f469fe..a68339fe 100644
--- a/api/buildcraft/api/package-info.java
+++ b/api/buildcraft/api/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core")
 package buildcraft.api;
diff --git a/api/buildcraft/api/power/IEngine.java b/api/buildcraft/api/power/IEngine.java
index 406a8d4d..08811aeb 100644
--- a/api/buildcraft/api/power/IEngine.java
+++ b/api/buildcraft/api/power/IEngine.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.power;
 
diff --git a/api/buildcraft/api/power/ILaserTarget.java b/api/buildcraft/api/power/ILaserTarget.java
index 8d896cb8..06ae48cc 100644
--- a/api/buildcraft/api/power/ILaserTarget.java
+++ b/api/buildcraft/api/power/ILaserTarget.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.power;
 
diff --git a/api/buildcraft/api/power/ILaserTargetBlock.java b/api/buildcraft/api/power/ILaserTargetBlock.java
index 71298b14..83cdfcf2 100644
--- a/api/buildcraft/api/power/ILaserTargetBlock.java
+++ b/api/buildcraft/api/power/ILaserTargetBlock.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.power;
 
diff --git a/api/buildcraft/api/power/package-info.java b/api/buildcraft/api/power/package-info.java
index 597c6789..34ed47c5 100644
--- a/api/buildcraft/api/power/package-info.java
+++ b/api/buildcraft/api/power/package-info.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 @API(apiVersion = "1.2", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|power")
 package buildcraft.api.power;
 import cpw.mods.fml.common.API;
diff --git a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java
index 64a392db..57d20065 100644
--- a/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java
+++ b/api/buildcraft/api/recipes/BuildcraftRecipeRegistry.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/CraftingResult.java b/api/buildcraft/api/recipes/CraftingResult.java
index 09407ca0..d7b0e0fe 100755
--- a/api/buildcraft/api/recipes/CraftingResult.java
+++ b/api/buildcraft/api/recipes/CraftingResult.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/IAssemblyRecipeManager.java b/api/buildcraft/api/recipes/IAssemblyRecipeManager.java
index 6e2ddf89..e70c2328 100644
--- a/api/buildcraft/api/recipes/IAssemblyRecipeManager.java
+++ b/api/buildcraft/api/recipes/IAssemblyRecipeManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/IFlexibleCrafter.java b/api/buildcraft/api/recipes/IFlexibleCrafter.java
index 31403f15..95d1ce67 100644
--- a/api/buildcraft/api/recipes/IFlexibleCrafter.java
+++ b/api/buildcraft/api/recipes/IFlexibleCrafter.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/IFlexibleRecipe.java b/api/buildcraft/api/recipes/IFlexibleRecipe.java
index f1dfec23..a9a7553d 100755
--- a/api/buildcraft/api/recipes/IFlexibleRecipe.java
+++ b/api/buildcraft/api/recipes/IFlexibleRecipe.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java b/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java
index 92a765a0..afda123c 100644
--- a/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java
+++ b/api/buildcraft/api/recipes/IFlexibleRecipeViewable.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 package buildcraft.api.recipes;
 
 import java.util.Collection;
diff --git a/api/buildcraft/api/recipes/IIntegrationRecipe.java b/api/buildcraft/api/recipes/IIntegrationRecipe.java
index 86dfaee5..c52b8814 100644
--- a/api/buildcraft/api/recipes/IIntegrationRecipe.java
+++ b/api/buildcraft/api/recipes/IIntegrationRecipe.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/IIntegrationRecipeManager.java b/api/buildcraft/api/recipes/IIntegrationRecipeManager.java
index f18ae77b..7bd2258e 100644
--- a/api/buildcraft/api/recipes/IIntegrationRecipeManager.java
+++ b/api/buildcraft/api/recipes/IIntegrationRecipeManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/IRefineryRecipeManager.java b/api/buildcraft/api/recipes/IRefineryRecipeManager.java
index 4af07f49..5d09508f 100644
--- a/api/buildcraft/api/recipes/IRefineryRecipeManager.java
+++ b/api/buildcraft/api/recipes/IRefineryRecipeManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.recipes;
 
diff --git a/api/buildcraft/api/recipes/package-info.java b/api/buildcraft/api/recipes/package-info.java
index e7b4a170..d76b2dfe 100644
--- a/api/buildcraft/api/recipes/package-info.java
+++ b/api/buildcraft/api/recipes/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "2.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|recipes")
 package buildcraft.api.recipes;
diff --git a/api/buildcraft/api/robots/AIRobot.java b/api/buildcraft/api/robots/AIRobot.java
index c53b16ca..47428c84 100755
--- a/api/buildcraft/api/robots/AIRobot.java
+++ b/api/buildcraft/api/robots/AIRobot.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.robots;
 
diff --git a/api/buildcraft/api/robots/EntityRobotBase.java b/api/buildcraft/api/robots/EntityRobotBase.java
index 4ddc47b3..75f61d9b 100755
--- a/api/buildcraft/api/robots/EntityRobotBase.java
+++ b/api/buildcraft/api/robots/EntityRobotBase.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.robots;
 
diff --git a/api/buildcraft/api/robots/IDockingStation.java b/api/buildcraft/api/robots/IDockingStation.java
index cb635715..746a1a09 100755
--- a/api/buildcraft/api/robots/IDockingStation.java
+++ b/api/buildcraft/api/robots/IDockingStation.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.robots;
 
diff --git a/api/buildcraft/api/robots/IRequestProvider.java b/api/buildcraft/api/robots/IRequestProvider.java
index ee822c4a..b227a586 100755
--- a/api/buildcraft/api/robots/IRequestProvider.java
+++ b/api/buildcraft/api/robots/IRequestProvider.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.robots;
 
diff --git a/api/buildcraft/api/robots/IRobotRegistry.java b/api/buildcraft/api/robots/IRobotRegistry.java
index 707a73b7..334f5b63 100755
--- a/api/buildcraft/api/robots/IRobotRegistry.java
+++ b/api/buildcraft/api/robots/IRobotRegistry.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.robots;
 
diff --git a/api/buildcraft/api/robots/ResourceId.java b/api/buildcraft/api/robots/ResourceId.java
index 543a220b..9f49fb0b 100755
--- a/api/buildcraft/api/robots/ResourceId.java
+++ b/api/buildcraft/api/robots/ResourceId.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.robots;
 
diff --git a/api/buildcraft/api/robots/StackRequest.java b/api/buildcraft/api/robots/StackRequest.java
index 7a6163c8..555cd9a7 100755
--- a/api/buildcraft/api/robots/StackRequest.java
+++ b/api/buildcraft/api/robots/StackRequest.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.robots;
 
diff --git a/api/buildcraft/api/robots/package-info.java b/api/buildcraft/api/robots/package-info.java
index fe3ca430..17c00094 100644
--- a/api/buildcraft/api/robots/package-info.java
+++ b/api/buildcraft/api/robots/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|robots")
 package buildcraft.api.robots;
diff --git a/api/buildcraft/api/statements/ActionState.java b/api/buildcraft/api/statements/ActionState.java
index 1a30beb4..5ef15e93 100755
--- a/api/buildcraft/api/statements/ActionState.java
+++ b/api/buildcraft/api/statements/ActionState.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IActionExternal.java b/api/buildcraft/api/statements/IActionExternal.java
index 6bb0ad1b..cd5685a0 100644
--- a/api/buildcraft/api/statements/IActionExternal.java
+++ b/api/buildcraft/api/statements/IActionExternal.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IActionInternal.java b/api/buildcraft/api/statements/IActionInternal.java
index 21f2c7f8..c8915bb0 100644
--- a/api/buildcraft/api/statements/IActionInternal.java
+++ b/api/buildcraft/api/statements/IActionInternal.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IActionProvider.java b/api/buildcraft/api/statements/IActionProvider.java
index 761156f8..6c93ada8 100644
--- a/api/buildcraft/api/statements/IActionProvider.java
+++ b/api/buildcraft/api/statements/IActionProvider.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IActionReceptor.java b/api/buildcraft/api/statements/IActionReceptor.java
index f4ef4968..43e08477 100644
--- a/api/buildcraft/api/statements/IActionReceptor.java
+++ b/api/buildcraft/api/statements/IActionReceptor.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IOverrideDefaultStatements.java b/api/buildcraft/api/statements/IOverrideDefaultStatements.java
index 22d86ebc..a469d7d9 100644
--- a/api/buildcraft/api/statements/IOverrideDefaultStatements.java
+++ b/api/buildcraft/api/statements/IOverrideDefaultStatements.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IStatement.java b/api/buildcraft/api/statements/IStatement.java
index a05824d6..6c31436b 100644
--- a/api/buildcraft/api/statements/IStatement.java
+++ b/api/buildcraft/api/statements/IStatement.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IStatementContainer.java b/api/buildcraft/api/statements/IStatementContainer.java
index f258b341..82bd6019 100644
--- a/api/buildcraft/api/statements/IStatementContainer.java
+++ b/api/buildcraft/api/statements/IStatementContainer.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/IStatementParameter.java b/api/buildcraft/api/statements/IStatementParameter.java
index 0bbc3dcb..2b437005 100755
--- a/api/buildcraft/api/statements/IStatementParameter.java
+++ b/api/buildcraft/api/statements/IStatementParameter.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/ITriggerExternal.java b/api/buildcraft/api/statements/ITriggerExternal.java
index 9167761c..7cbd327e 100644
--- a/api/buildcraft/api/statements/ITriggerExternal.java
+++ b/api/buildcraft/api/statements/ITriggerExternal.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/ITriggerInternal.java b/api/buildcraft/api/statements/ITriggerInternal.java
index 750331b5..d748152d 100755
--- a/api/buildcraft/api/statements/ITriggerInternal.java
+++ b/api/buildcraft/api/statements/ITriggerInternal.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/ITriggerProvider.java b/api/buildcraft/api/statements/ITriggerProvider.java
index 92c15421..204221ef 100644
--- a/api/buildcraft/api/statements/ITriggerProvider.java
+++ b/api/buildcraft/api/statements/ITriggerProvider.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/StatementManager.java b/api/buildcraft/api/statements/StatementManager.java
index 9e85d025..734dc32f 100644
--- a/api/buildcraft/api/statements/StatementManager.java
+++ b/api/buildcraft/api/statements/StatementManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/StatementMouseClick.java b/api/buildcraft/api/statements/StatementMouseClick.java
index d48ade5c..7be49ced 100644
--- a/api/buildcraft/api/statements/StatementMouseClick.java
+++ b/api/buildcraft/api/statements/StatementMouseClick.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/StatementParameterItemStack.java b/api/buildcraft/api/statements/StatementParameterItemStack.java
index 02c796db..1ab38771 100755
--- a/api/buildcraft/api/statements/StatementParameterItemStack.java
+++ b/api/buildcraft/api/statements/StatementParameterItemStack.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.statements;
 
diff --git a/api/buildcraft/api/statements/package-info.java b/api/buildcraft/api/statements/package-info.java
index 94d36f68..bb5960f9 100644
--- a/api/buildcraft/api/statements/package-info.java
+++ b/api/buildcraft/api/statements/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|statements")
 package buildcraft.api.statements;
diff --git a/api/buildcraft/api/tiles/IControllable.java b/api/buildcraft/api/tiles/IControllable.java
index b2739fa3..346671fc 100644
--- a/api/buildcraft/api/tiles/IControllable.java
+++ b/api/buildcraft/api/tiles/IControllable.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.tiles;
 
diff --git a/api/buildcraft/api/tiles/IHasWork.java b/api/buildcraft/api/tiles/IHasWork.java
index 6eff8f5b..08e5ed7f 100644
--- a/api/buildcraft/api/tiles/IHasWork.java
+++ b/api/buildcraft/api/tiles/IHasWork.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.tiles;
 
diff --git a/api/buildcraft/api/tiles/IHeatable.java b/api/buildcraft/api/tiles/IHeatable.java
index 7e825178..586b5083 100644
--- a/api/buildcraft/api/tiles/IHeatable.java
+++ b/api/buildcraft/api/tiles/IHeatable.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.tiles;
 
diff --git a/api/buildcraft/api/tiles/package-info.java b/api/buildcraft/api/tiles/package-info.java
index dacec92a..0e3d4d89 100644
--- a/api/buildcraft/api/tiles/package-info.java
+++ b/api/buildcraft/api/tiles/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tiles")
 package buildcraft.api.tiles;
diff --git a/api/buildcraft/api/tools/IToolWrench.java b/api/buildcraft/api/tools/IToolWrench.java
index 3bd8dcea..c71e2b0d 100644
--- a/api/buildcraft/api/tools/IToolWrench.java
+++ b/api/buildcraft/api/tools/IToolWrench.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.tools;
 
diff --git a/api/buildcraft/api/tools/package-info.java b/api/buildcraft/api/tools/package-info.java
index 6a2a363a..92e55d7b 100644
--- a/api/buildcraft/api/tools/package-info.java
+++ b/api/buildcraft/api/tools/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|tools")
 package buildcraft.api.tools;
diff --git a/api/buildcraft/api/transport/IExtractionHandler.java b/api/buildcraft/api/transport/IExtractionHandler.java
index 4d56659e..e27f89aa 100755
--- a/api/buildcraft/api/transport/IExtractionHandler.java
+++ b/api/buildcraft/api/transport/IExtractionHandler.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.transport;
 
diff --git a/api/buildcraft/api/transport/IPipe.java b/api/buildcraft/api/transport/IPipe.java
index e4a82a4c..1080db8a 100755
--- a/api/buildcraft/api/transport/IPipe.java
+++ b/api/buildcraft/api/transport/IPipe.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.transport;
 
diff --git a/api/buildcraft/api/transport/IPipeConnection.java b/api/buildcraft/api/transport/IPipeConnection.java
index 93bb0d42..4cac6a84 100644
--- a/api/buildcraft/api/transport/IPipeConnection.java
+++ b/api/buildcraft/api/transport/IPipeConnection.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.transport;
 
diff --git a/api/buildcraft/api/transport/IPipePluggable.java b/api/buildcraft/api/transport/IPipePluggable.java
index b299d07f..41ba3c6f 100755
--- a/api/buildcraft/api/transport/IPipePluggable.java
+++ b/api/buildcraft/api/transport/IPipePluggable.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.transport;
 
diff --git a/api/buildcraft/api/transport/IPipeTile.java b/api/buildcraft/api/transport/IPipeTile.java
index 00756365..4bdc8c25 100644
--- a/api/buildcraft/api/transport/IPipeTile.java
+++ b/api/buildcraft/api/transport/IPipeTile.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.transport;
 
diff --git a/api/buildcraft/api/transport/IStripesHandler.java b/api/buildcraft/api/transport/IStripesHandler.java
index f8c36e36..8ad66dfe 100644
--- a/api/buildcraft/api/transport/IStripesHandler.java
+++ b/api/buildcraft/api/transport/IStripesHandler.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 package buildcraft.api.transport;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/api/buildcraft/api/transport/IStripesPipe.java b/api/buildcraft/api/transport/IStripesPipe.java
index e6575097..f2159bf4 100644
--- a/api/buildcraft/api/transport/IStripesPipe.java
+++ b/api/buildcraft/api/transport/IStripesPipe.java
@@ -1,3 +1,11 @@
+/**
+ * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
+ * http://www.mod-buildcraft.com
+ *
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
+ */
 package buildcraft.api.transport;
 
 import net.minecraft.item.ItemStack;
diff --git a/api/buildcraft/api/transport/PipeManager.java b/api/buildcraft/api/transport/PipeManager.java
index 6cc0e342..14a2b53f 100755
--- a/api/buildcraft/api/transport/PipeManager.java
+++ b/api/buildcraft/api/transport/PipeManager.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.transport;
 
diff --git a/api/buildcraft/api/transport/PipeWire.java b/api/buildcraft/api/transport/PipeWire.java
index e7551091..6f2fd504 100644
--- a/api/buildcraft/api/transport/PipeWire.java
+++ b/api/buildcraft/api/transport/PipeWire.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 package buildcraft.api.transport;
 
diff --git a/api/buildcraft/api/transport/package-info.java b/api/buildcraft/api/transport/package-info.java
index 414098f2..e75566ef 100644
--- a/api/buildcraft/api/transport/package-info.java
+++ b/api/buildcraft/api/transport/package-info.java
@@ -2,9 +2,9 @@
  * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team
  * http://www.mod-buildcraft.com
  *
- * BuildCraft is distributed under the terms of the Minecraft Mod Public
- * License 1.0, or MMPL. Please check the contents of the license located in
- * http://www.mod-buildcraft.com/MMPL-1.0.txt
+ * The BuildCraft API is distributed under the terms of the MIT License.
+ * Please check the contents of the license, which should be located
+ * as "LICENSE.API" in the BuildCraft source code distribution.
  */
 @API(apiVersion = "2.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport")
 package buildcraft.api.transport;

From 2538c3457c43ce4d8fc2d594ce34f758f10ef104 Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Wed, 10 Dec 2014 20:50:38 +0100
Subject: [PATCH 11/18] BuildCraft 6.2.3

---
 build.gradle                                  |   2 +-
 buildcraft_resources/{LICENSE.txt => LICENSE} |   6 +-
 buildcraft_resources/LICENSE.API              |  22 +++
 buildcraft_resources/LICENSE.CoFH             | 165 ++++++++++++++++++
 buildcraft_resources/changelog/6.2.3          |  12 ++
 buildcraft_resources/versions.txt             |   2 +-
 6 files changed, 204 insertions(+), 5 deletions(-)
 rename buildcraft_resources/{LICENSE.txt => LICENSE} (94%)
 create mode 100644 buildcraft_resources/LICENSE.API
 create mode 100644 buildcraft_resources/LICENSE.CoFH
 create mode 100644 buildcraft_resources/changelog/6.2.3

diff --git a/build.gradle b/build.gradle
index 6d1000b8..0dab70ba 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 = "6.2.2"
+version = "6.2.3"
 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/LICENSE.txt b/buildcraft_resources/LICENSE
similarity index 94%
rename from buildcraft_resources/LICENSE.txt
rename to buildcraft_resources/LICENSE
index c7b55475..a445a6fb 100644
--- a/buildcraft_resources/LICENSE.txt
+++ b/buildcraft_resources/LICENSE
@@ -36,7 +36,7 @@ This mod is provided 'as is' with no warranties, implied or otherwise. The owner
 of this mod takes no responsibility for any damages incurred from the use of
 this mod. This mod alters fundamental parts of the Minecraft game, parts of
 Minecraft may not work with this mod installed. All damages caused from the use
-or misuse of this mod fall on the user.
+or misuse of this mad fall on the user.
 
 3. Play rights
 --------------
@@ -77,9 +77,9 @@ entire set of sources or modified sources at no costs.
 
 All distributions of this mod must remain licensed under the MMPL.
 
-All dependencies that this mod has on other mods or classes must be licensed
+All dependencies that this mod have on other mods or classes must be licensed
 under conditions comparable to this version of MMPL, with the exception of the
-Minecraft code and the mod loading framework (e.g. ModLoader, ModLoaderMP, Minecraft Forge/Forge Modloader or
+Minecraft code and the mod loading framework (e.g. ModLoader, ModLoaderMP or
 Bukkit).
 
 Modified version of binaries and sources, as well as files containing sections
diff --git a/buildcraft_resources/LICENSE.API b/buildcraft_resources/LICENSE.API
new file mode 100644
index 00000000..017c1bb2
--- /dev/null
+++ b/buildcraft_resources/LICENSE.API
@@ -0,0 +1,22 @@
+BuildCraft API License
+
+Copyright (c) 2011-2014 SpaceToad and the BuildCraft team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/buildcraft_resources/LICENSE.CoFH b/buildcraft_resources/LICENSE.CoFH
new file mode 100644
index 00000000..65c5ca88
--- /dev/null
+++ b/buildcraft_resources/LICENSE.CoFH
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/buildcraft_resources/changelog/6.2.3 b/buildcraft_resources/changelog/6.2.3
new file mode 100644
index 00000000..cda1ba56
--- /dev/null
+++ b/buildcraft_resources/changelog/6.2.3
@@ -0,0 +1,12 @@
+Additions:
+* [#2248] Relicense BuildCraft API under MIT (asie)
+* [#1923] Quarry chunkloading can now be disabled (asie)
+* Updated translations: Japanese (tokoku-11), Portuguese (al-myr), Slovak (leSamo), Taiwanese (unoya)
+
+Bugfixes:
+* [#2275] Crash with ChickenChunks (asie)
+* [#2274] Builder requirements list only gets loaded when power is supplied (asie)
+* [#2271] Combustion Engines cannot be fixed with wrench (asie)
+* [#2197] Stripes pipes do not pick up water and lava (asie)
+* Broken gate rendering for ItemStacks with color multipliers in slots (asie)
+* Quarries drop a frame block when broken (asie)
diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt
index 4cc7e0fd..a9957525 100755
--- a/buildcraft_resources/versions.txt
+++ b/buildcraft_resources/versions.txt
@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:6.2.2
+1.7.10:BuildCraft:6.2.3

From 01ad2501c979f359d5fa97607a4e1d7acbd89bbd Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Wed, 10 Dec 2014 23:41:55 +0100
Subject: [PATCH 12/18] BC 6.2.4, fix #2290

---
 build.gradle                              | 2 +-
 buildcraft_resources/changelog/6.2.4      | 2 ++
 buildcraft_resources/versions.txt         | 2 +-
 common/buildcraft/factory/TileQuarry.java | 9 ++++++++-
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 buildcraft_resources/changelog/6.2.4

diff --git a/build.gradle b/build.gradle
index 0dab70ba..87762012 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 = "6.2.3"
+version = "6.2.4"
 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/changelog/6.2.4 b/buildcraft_resources/changelog/6.2.4
new file mode 100644
index 00000000..74e74f1b
--- /dev/null
+++ b/buildcraft_resources/changelog/6.2.4
@@ -0,0 +1,2 @@
+Bugfixes:
+* [#2290] 6.2.2 Regresion: Pipes don't connect to quarry (asie)
diff --git a/buildcraft_resources/versions.txt b/buildcraft_resources/versions.txt
index a9957525..9971fd5f 100755
--- a/buildcraft_resources/versions.txt
+++ b/buildcraft_resources/versions.txt
@@ -1,3 +1,3 @@
 1.6.4:BuildCraft:4.2.2
 1.7.2:BuildCraft:6.0.16
-1.7.10:BuildCraft:6.2.3
+1.7.10:BuildCraft:6.2.4
diff --git a/common/buildcraft/factory/TileQuarry.java b/common/buildcraft/factory/TileQuarry.java
index 2bd08039..99627b5e 100644
--- a/common/buildcraft/factory/TileQuarry.java
+++ b/common/buildcraft/factory/TileQuarry.java
@@ -35,6 +35,8 @@ import buildcraft.api.core.IAreaProvider;
 import buildcraft.api.core.SafeTimeTracker;
 import buildcraft.api.filler.FillerManager;
 import buildcraft.api.tiles.IHasWork;
+import buildcraft.api.transport.IPipeConnection;
+import buildcraft.api.transport.IPipeTile;
 import buildcraft.core.Box;
 import buildcraft.core.Box.Kind;
 import buildcraft.core.CoreConstants;
@@ -49,7 +51,7 @@ import buildcraft.core.proxy.CoreProxy;
 import buildcraft.core.utils.BlockUtils;
 import buildcraft.core.utils.Utils;
 
-public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory, IDropControlInventory {
+public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedInventory, IDropControlInventory, IPipeConnection {
 
 	private static enum Stage {
 		BUILDING,
@@ -860,4 +862,9 @@ public class TileQuarry extends TileAbstractBuilder implements IHasWork, ISidedI
 	public boolean doDrop() {
 		return false;
 	}
+
+	@Override
+	public ConnectOverride overridePipeConnection(IPipeTile.PipeType type, ForgeDirection with) {
+		return type == IPipeTile.PipeType.ITEM ? ConnectOverride.CONNECT : ConnectOverride.DEFAULT;
+	}
 }

From 51d8c06b9fc4528a3357e750c50ffe01830beaaf Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Thu, 11 Dec 2014 16:42:07 +0100
Subject: [PATCH 13/18] improve IFluidContainerItem logic, fix #2295

---
 common/buildcraft/factory/BlockTank.java | 29 ++++++++++++++++--------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/common/buildcraft/factory/BlockTank.java b/common/buildcraft/factory/BlockTank.java
index 83482969..2214befe 100644
--- a/common/buildcraft/factory/BlockTank.java
+++ b/common/buildcraft/factory/BlockTank.java
@@ -154,16 +154,27 @@ public class BlockTank extends BlockBuildCraft {
 						}
 					}
 				} else if (current.getItem() instanceof IFluidContainerItem) {
-					IFluidContainerItem container = (IFluidContainerItem) current.getItem();
-					FluidStack liquid = container.getFluid(current);
-					if (liquid != null && liquid.amount > 0) {
-						int qty = tank.fill(ForgeDirection.UNKNOWN, liquid, false);
-						tank.fill(ForgeDirection.UNKNOWN, container.drain(current, qty, true), true);
-					} else {
-						liquid = tank.drain(ForgeDirection.UNKNOWN, 1000, false);
-						int qtyToFill = container.fill(current, liquid, true);
-						tank.drain(ForgeDirection.UNKNOWN, qtyToFill, true);
+					if (!world.isRemote) {
+						IFluidContainerItem container = (IFluidContainerItem) current.getItem();
+						FluidStack liquid = container.getFluid(current);
+						FluidStack tankLiquid = tank.getTankInfo(ForgeDirection.UNKNOWN)[0].fluid;
+						boolean mustDrain = (liquid == null || liquid.amount == 0);
+						boolean mustFill = (tankLiquid == null || tankLiquid.amount == 0);
+						if (mustDrain && mustFill) {
+							// Both are empty, do nothing
+						} else if (mustDrain || !entityplayer.isSneaking()) {
+							liquid = tank.drain(ForgeDirection.UNKNOWN, 1000, false);
+							int qtyToFill = container.fill(current, liquid, true);
+							tank.drain(ForgeDirection.UNKNOWN, qtyToFill, true);
+						} else if (mustFill || entityplayer.isSneaking()) {
+							if (liquid != null && liquid.amount > 0) {
+								int qty = tank.fill(ForgeDirection.UNKNOWN, liquid, false);
+								tank.fill(ForgeDirection.UNKNOWN, container.drain(current, qty, true), true);
+							}
+						}
 					}
+
+					return true;
 				}
 			}
 		}

From cc7d3397f52fc4e6a7d82ceca5096c2510460cb8 Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Thu, 11 Dec 2014 16:48:21 +0100
Subject: [PATCH 14/18] improve builder error messaging, fix fluid block
 detection

---
 .../builders/HeuristicBlockDetection.java       | 17 ++++++++++-------
 .../core/blueprints/SchematicRegistry.java      |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/common/buildcraft/builders/HeuristicBlockDetection.java b/common/buildcraft/builders/HeuristicBlockDetection.java
index 45e65d25..1f0e92bd 100644
--- a/common/buildcraft/builders/HeuristicBlockDetection.java
+++ b/common/buildcraft/builders/HeuristicBlockDetection.java
@@ -8,6 +8,7 @@ import net.minecraft.init.Blocks;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.IFluidBlock;
 import buildcraft.api.blueprints.SchematicBlock;
 import buildcraft.api.blueprints.SchematicFluid;
 import buildcraft.builders.schematics.SchematicBlockCreative;
@@ -37,12 +38,7 @@ public final class HeuristicBlockDetection {
 				}
 			}
 		} */
-		
-		// Register fluids
-		for (Fluid f : FluidRegistry.getRegisteredFluids().values()) {
-			SchematicRegistry.INSTANCE.registerSchematicBlock(f.getBlock(), SchematicFluid.class, new FluidStack(f, 1000));
-		}
-		
+
 		// Register blocks
 		Iterator i = Block.blockRegistry.iterator();
 		while (i.hasNext()) {
@@ -67,7 +63,14 @@ public final class HeuristicBlockDetection {
 							if (creativeOnly) {
 								SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicBlockCreative.class);
 							} else {
-								SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicBlock.class);
+								if (block instanceof IFluidBlock) {
+									IFluidBlock fblock = (IFluidBlock) block;
+									if (fblock.getFluid() != null) {
+										SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicFluid.class, new FluidStack(fblock.getFluid(), 1000));
+									}
+								} else {
+									SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicBlock.class);
+								}
 							}
 						} catch (Exception e) {
 							e.printStackTrace();
diff --git a/common/buildcraft/core/blueprints/SchematicRegistry.java b/common/buildcraft/core/blueprints/SchematicRegistry.java
index 12335055..470ac078 100644
--- a/common/buildcraft/core/blueprints/SchematicRegistry.java
+++ b/common/buildcraft/core/blueprints/SchematicRegistry.java
@@ -96,7 +96,7 @@ public final class SchematicRegistry implements ISchematicRegistry {
 	
 	public void registerSchematicBlock(Block block, int meta, Class<? extends Schematic> clazz, Object... params) {
 		if (block == null || Block.blockRegistry.getNameForObject(block) == null || "null".equals(Block.blockRegistry.getNameForObject(block))) {
-			BCLog.logger.warn("Builder: Mod tried to register block schematic with a null name! Ignoring.");
+			BCLog.logger.warn("Builder: Mod tried to register block '" + (block != null ? block.getClass().getName() : "null") + "' schematic with a null name! Ignoring.");
 			return;
 		}
 		if (schematicBlocks.containsKey(toStringKey(block, meta))) {

From 6858738d4dd6fc1e233e07b1dc3379d3dd1b0b8b Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Fri, 12 Dec 2014 21:31:51 +0100
Subject: [PATCH 15/18] optimize zone planners, fix #2243

---
 common/buildcraft/BuildCraftBuilders.java     |  3 ++
 .../builders/HeuristicBlockDetection.java     |  2 +-
 .../builders/schematics/SchematicAir.java     | 13 +++++
 .../commander/ContainerZonePlan.java          | 52 ++++++-------------
 common/buildcraft/commander/TileZonePlan.java | 18 ++++---
 .../core/blueprints/SchematicRegistry.java    |  2 +-
 6 files changed, 46 insertions(+), 44 deletions(-)
 create mode 100644 common/buildcraft/builders/schematics/SchematicAir.java

diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java
index 60fece71..9ca50eed 100644
--- a/common/buildcraft/BuildCraftBuilders.java
+++ b/common/buildcraft/BuildCraftBuilders.java
@@ -76,6 +76,7 @@ import buildcraft.builders.TileFiller;
 import buildcraft.builders.TileMarker;
 import buildcraft.builders.TilePathMarker;
 import buildcraft.builders.blueprints.BlueprintDatabase;
+import buildcraft.builders.schematics.SchematicAir;
 import buildcraft.builders.schematics.SchematicBed;
 import buildcraft.builders.schematics.SchematicBlockCreative;
 import buildcraft.builders.schematics.SchematicCactus;
@@ -280,6 +281,8 @@ public class BuildCraftBuilders extends BuildCraftMod {
 
 		// Standard blocks
 		ISchematicRegistry schemes = BuilderAPI.schematicRegistry;
+		schemes.registerSchematicBlock(Blocks.air, SchematicAir.class);
+
 		schemes.registerSchematicBlock(Blocks.snow, SchematicIgnore.class);
 		schemes.registerSchematicBlock(Blocks.tallgrass, SchematicIgnore.class);
 		schemes.registerSchematicBlock(Blocks.double_plant, SchematicIgnore.class);
diff --git a/common/buildcraft/builders/HeuristicBlockDetection.java b/common/buildcraft/builders/HeuristicBlockDetection.java
index 1f0e92bd..db1a8c88 100644
--- a/common/buildcraft/builders/HeuristicBlockDetection.java
+++ b/common/buildcraft/builders/HeuristicBlockDetection.java
@@ -63,7 +63,7 @@ public final class HeuristicBlockDetection {
 							if (creativeOnly) {
 								SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicBlockCreative.class);
 							} else {
-								if (block instanceof IFluidBlock) {
+							    if (block instanceof IFluidBlock) {
 									IFluidBlock fblock = (IFluidBlock) block;
 									if (fblock.getFluid() != null) {
 										SchematicRegistry.INSTANCE.registerSchematicBlock(block, meta, SchematicFluid.class, new FluidStack(fblock.getFluid(), 1000));
diff --git a/common/buildcraft/builders/schematics/SchematicAir.java b/common/buildcraft/builders/schematics/SchematicAir.java
new file mode 100644
index 00000000..e2449826
--- /dev/null
+++ b/common/buildcraft/builders/schematics/SchematicAir.java
@@ -0,0 +1,13 @@
+package buildcraft.builders.schematics;
+
+import java.util.LinkedList;
+import net.minecraft.item.ItemStack;
+import buildcraft.api.blueprints.IBuilderContext;
+import buildcraft.api.blueprints.SchematicBlock;
+
+public class SchematicAir extends SchematicBlock {
+	@Override
+	public void getRequirementsForPlacement(IBuilderContext context, LinkedList<ItemStack> requirements) {
+
+	}
+}
diff --git a/common/buildcraft/commander/ContainerZonePlan.java b/common/buildcraft/commander/ContainerZonePlan.java
index 7afc34ee..3fe56482 100755
--- a/common/buildcraft/commander/ContainerZonePlan.java
+++ b/common/buildcraft/commander/ContainerZonePlan.java
@@ -8,6 +8,11 @@
  */
 package buildcraft.commander;
 
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.IntBuffer;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.entity.player.EntityPlayer;
@@ -82,9 +87,10 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe
 				currentAreaSelection.readData(stream);
 				gui.refreshSelectedArea();
 			} else if ("receiveImage".equals(command)) {
-				int size = stream.readUnsignedShort();
+				int size = stream.readUnsignedMedium();
+
 				for (int i = 0; i < size; ++i) {
-					mapTexture.colorMap[i] = stream.readInt();
+					mapTexture.colorMap[i] = 0xFF000000 | MapColor.mapColorArray[stream.readUnsignedByte()].colorValue;
 				}
 			}
 		} else if (side.isServer()) {
@@ -109,52 +115,28 @@ public class ContainerZonePlan extends BuildCraftContainer implements ICommandRe
 	}
 
 	private void computeMap(int cx, int cz, int width, int height, int blocksPerPixel, EntityPlayer player) {
-		mapTexture = new BCDynamicTexture(width, height);
+		final byte[] textureData = new byte[width * height];
 
 		int startX = cx - width * blocksPerPixel / 2;
 		int startZ = cz - height * blocksPerPixel / 2;
 
 		for (int i = 0; i < width; ++i) {
 			for (int j = 0; j < height; ++j) {
-				double r = 0;
-				double g = 0;
-				double b = 0;
+				int x = startX + i * blocksPerPixel;
+				int z = startZ + j * blocksPerPixel;
+				int ix = x - (map.chunkStartX << 4);
+				int iz = z - (map.chunkStartZ << 4);
 
-				for (int stepi = 0; stepi < blocksPerPixel; ++stepi) {
-					for (int stepj = 0; stepj < blocksPerPixel; ++stepj) {
-						int x = startX + i * blocksPerPixel + stepi;
-						int z = startZ + j * blocksPerPixel + stepj;
-						int ix = x - (map.chunkStartX << 4);
-						int iz = z - (map.chunkStartZ << 4);
-
-						if (ix > 0 && ix < TileZonePlan.RESOLUTION && iz > 0 && iz < TileZonePlan.RESOLUTION) {
-							int color = MapColor.mapColorArray[map.colors[ix + iz * TileZonePlan.RESOLUTION]].colorValue;
-
-							r += (color >> 16) & 255;
-							g += (color >> 8) & 255;
-							b += color & 255;
-						}
-					}
+				if (ix >= 0 && iz >= 0 && ix < TileZonePlan.RESOLUTION && iz < TileZonePlan.RESOLUTION) {
+					textureData[i + j * width] = map.colors[ix + iz * TileZonePlan.RESOLUTION];
 				}
-
-				r /= blocksPerPixel * blocksPerPixel;
-				g /= blocksPerPixel * blocksPerPixel;
-				b /= blocksPerPixel * blocksPerPixel;
-
-				r /= 255F;
-				g /= 255F;
-				b /= 255F;
-
-				mapTexture.setColor(i, j, r, g, b, 1);
 			}
 		}
 
 		BuildCraftCore.instance.sendToPlayer(player, new PacketCommand(this, "receiveImage", new CommandWriter() {
 			public void write(ByteBuf data) {
-				data.writeShort(mapTexture.colorMap.length);
-				for (int i = 0; i < mapTexture.colorMap.length; i++) {
-					data.writeInt(mapTexture.colorMap[i]);
-				}
+				data.writeMedium(textureData.length);
+				data.writeBytes(textureData);
 			}
 		}));
 	}
diff --git a/common/buildcraft/commander/TileZonePlan.java b/common/buildcraft/commander/TileZonePlan.java
index e981da9d..e6d12c08 100644
--- a/common/buildcraft/commander/TileZonePlan.java
+++ b/common/buildcraft/commander/TileZonePlan.java
@@ -9,12 +9,14 @@
 package buildcraft.commander;
 
 import io.netty.buffer.ByteBuf;
+import net.minecraft.block.material.MapColor;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.chunk.Chunk;
 
+import buildcraft.api.core.SafeTimeTracker;
 import buildcraft.core.ItemMapLocation;
 import buildcraft.core.TileBuildCraft;
 import buildcraft.core.ZonePlan;
@@ -39,6 +41,8 @@ public class TileZonePlan extends TileBuildCraft implements IInventory {
 
 	private SimpleInventory inv = new SimpleInventory(2, "inv", 64);
 
+	private SafeTimeTracker zonePlannerScanning = new SafeTimeTracker(5);
+
 	@Override
 	public void initialize() {
 		super.initialize();
@@ -103,7 +107,7 @@ public class TileZonePlan extends TileBuildCraft implements IInventory {
 			return;
 		}
 
-		if (scan) {
+		if (scan && zonePlannerScanning.markTimeIfDelay(worldObj)) {
 			int[] coords = getCoords();
 			Chunk chunk = worldObj.getChunkFromChunkCoords(coords[0], coords[1]);
 			loadChunk(chunk);
@@ -147,11 +151,11 @@ public class TileZonePlan extends TileBuildCraft implements IInventory {
 				int x = (chunk.xPosition << 4) + cx;
 				int z = (chunk.zPosition << 4) + cz;
 
-				int color = 0;
-
-				for (int y = getWorldObj().getHeight() - 1; y >= 0; --y) {
-					if (!chunk.getBlock(cx, y, cz).isAir(worldObj, x, y, z)) {
-						color = chunk.getBlock(cx, y, cz).getMapColor(0).colorIndex;
+				int y = getWorldObj().getHeightValue(x, z);
+				int color;
+				while ((color = chunk.getBlock(cx, y, cz).getMapColor(0).colorIndex) == MapColor.airColor.colorIndex) {
+					y--;
+					if (y < 0) {
 						break;
 					}
 				}
@@ -193,7 +197,7 @@ public class TileZonePlan extends TileBuildCraft implements IInventory {
 		chunkIt = nbt.getInteger("chunkIt");
 		colors = nbt.getByteArray("colors");
 
-		if (colors.length != RESOLUTION * RESOLUTION || chunkIt >= colors.length) {
+		if (colors.length != RESOLUTION * RESOLUTION || chunkIt >= RESOLUTION_CHUNKS * RESOLUTION_CHUNKS) {
 			colors = new byte[RESOLUTION * RESOLUTION];
 			scan = true;
 			chunkIt = 0;
diff --git a/common/buildcraft/core/blueprints/SchematicRegistry.java b/common/buildcraft/core/blueprints/SchematicRegistry.java
index 470ac078..521b5a07 100644
--- a/common/buildcraft/core/blueprints/SchematicRegistry.java
+++ b/common/buildcraft/core/blueprints/SchematicRegistry.java
@@ -116,7 +116,7 @@ public final class SchematicRegistry implements ISchematicRegistry {
 	}
 
 	public SchematicBlock createSchematicBlock(Block block, int metadata) {
-		if (block == null || block == Blocks.air || metadata < 0 || metadata >= 16) {
+		if (block == null || metadata < 0 || metadata >= 16) {
 			return null;
 		}
 

From 883de2d8bb5c3dea747cad0744d675dd5dfc48fa Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Sat, 13 Dec 2014 10:20:44 +0100
Subject: [PATCH 16/18] fix #2298, add list tooltips, fix inserting lists
 inside lists, fix list stackability

---
 .../assets/buildcraft/lang/en_US.lang         |  2 ++
 common/buildcraft/core/ItemList.java          |  5 ++++
 common/buildcraft/core/gui/AdvancedSlot.java  |  3 ++-
 common/buildcraft/core/gui/ContainerList.java |  2 +-
 common/buildcraft/core/gui/GuiList.java       | 23 ++++++++++++++++---
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/buildcraft_resources/assets/buildcraft/lang/en_US.lang b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
index 5b2f2989..424a99d9 100644
--- a/buildcraft_resources/assets/buildcraft/lang/en_US.lang
+++ b/buildcraft_resources/assets/buildcraft/lang/en_US.lang
@@ -159,6 +159,8 @@ gui.heat=Heat
 gui.assemblyRate=Energy Rate
 gui.assemblyCurrentRequired=Energy Required
 gui.clickcraft=-Click to Craft-
+gui.list.metadata=Accept Variations
+gui.list.oredict=Accept Equivalents
 gui.pipes.emerald.title=Filters
 gui.pipes.emerald.blocking=Blocking
 gui.pipes.emerald.blocking.tip=Extraction is blocked if one element in filter is missing
diff --git a/common/buildcraft/core/ItemList.java b/common/buildcraft/core/ItemList.java
index c1005dcb..058c3853 100644
--- a/common/buildcraft/core/ItemList.java
+++ b/common/buildcraft/core/ItemList.java
@@ -209,6 +209,11 @@ public class ItemList extends ItemBuildCraft {
 		}
 	}
 
+	public ItemList() {
+		super();
+		setMaxStackSize(1);
+	}
+
 	@Override
 	public IIcon getIconIndex(ItemStack stack) {
 		if (NBTUtils.getItemData(stack).hasKey("written")) {
diff --git a/common/buildcraft/core/gui/AdvancedSlot.java b/common/buildcraft/core/gui/AdvancedSlot.java
index 415144b7..15e3855f 100755
--- a/common/buildcraft/core/gui/AdvancedSlot.java
+++ b/common/buildcraft/core/gui/AdvancedSlot.java
@@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
 
 import buildcraft.core.DefaultProps;
 
@@ -38,7 +39,7 @@ public abstract class AdvancedSlot {
 	}
 
 	public final void drawTooltip(GuiAdvancedInterface gui, int x, int y) {
-		String s = getDescription();
+		String s = StatCollector.translateToLocal(getDescription());
 
 		if (s != null) {
 			gui.drawTooltip(s, x, y);
diff --git a/common/buildcraft/core/gui/ContainerList.java b/common/buildcraft/core/gui/ContainerList.java
index 6748673f..d34d1ee2 100755
--- a/common/buildcraft/core/gui/ContainerList.java
+++ b/common/buildcraft/core/gui/ContainerList.java
@@ -54,7 +54,7 @@ public class ContainerList extends BuildCraftContainer implements ICommandReceiv
 		ItemList.saveLine(player.getCurrentEquippedItem(), lines[lineIndex], lineIndex);
 
 		if (player.worldObj.isRemote) {
-			BuildCraftCore.instance.sendToServer(new PacketCommand(this, "switchButton", new CommandWriter() {
+			BuildCraftCore.instance.sendToServer(new PacketCommand(this, "setStack", new CommandWriter() {
 				public void write(ByteBuf data) {
 					data.writeByte(lineIndex);
 					data.writeByte(slotIndex);
diff --git a/common/buildcraft/core/gui/GuiList.java b/common/buildcraft/core/gui/GuiList.java
index 9328dfb1..ad6da86b 100755
--- a/common/buildcraft/core/gui/GuiList.java
+++ b/common/buildcraft/core/gui/GuiList.java
@@ -10,6 +10,7 @@ package buildcraft.core.gui;
 
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 
@@ -76,12 +77,19 @@ public class GuiList extends GuiAdvancedInterface {
 
 		public int line;
 		public int kind;
+		private String desc;
 
-		public Button(GuiAdvancedInterface gui, int x, int y, int iLine, int iKind) {
+		@Override
+		public String getDescription() {
+			return desc;
+		}
+
+		public Button(GuiAdvancedInterface gui, int x, int y, int iLine, int iKind, String iDesc) {
 			super(gui, x, y);
 
 			line = iLine;
 			kind = iKind;
+			desc = iDesc;
 		}
 
 	}
@@ -99,8 +107,8 @@ public class GuiList extends GuiAdvancedInterface {
 				slots.add(new SecondarySlot(this, 44 + sx * 18, 31 + sy * 18, sy, sx));
 			}
 
-			slots.add(new Button(this, 8, 31 + sy * 18, sy, 0));
-			slots.add(new Button(this, 26, 31 + sy * 18, sy, 1));
+			slots.add(new Button(this, 8, 31 + sy * 18, sy, 0, "gui.list.metadata"));
+			slots.add(new Button(this, 26, 31 + sy * 18, sy, 1, "gui.list.oredict"));
 		}
 
 		player = iPlayer;
@@ -166,10 +174,19 @@ public class GuiList extends GuiAdvancedInterface {
 		drawTooltipForSlotAt(par1, par2);
 	}
 
+	private boolean isCarryingList() {
+		ItemStack stack = mc.thePlayer.inventory.getItemStack();
+		return (stack != null && stack.getItem() != null && stack.getItem() instanceof ItemList);
+	}
+
 	@Override
 	protected void mouseClicked(int x, int y, int b) {
 		super.mouseClicked(x, y, b);
 
+		if (isCarryingList()) {
+			return;
+		}
+
 		AdvancedSlot slot = getSlotAtLocation(x, y);
 		ContainerList container = (ContainerList) getContainer();
 

From 9299ddccac55d3560ac4ff472961c86c180d1b80 Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Sat, 13 Dec 2014 10:59:53 +0100
Subject: [PATCH 17/18] implement recolourBlock API for pipes, water buckets
 now bleach the pipe colour

---
 .../transport/BlockGenericPipe.java           | 16 ++++++++
 common/buildcraft/transport/ItemPipe.java     |  6 +--
 .../buildcraft/transport/TileGenericPipe.java | 37 +++++++++++--------
 .../transport/pipes/PipeItemsStripes.java     |  4 +-
 .../transport/render/PipeRendererWorld.java   |  7 ++--
 5 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/common/buildcraft/transport/BlockGenericPipe.java b/common/buildcraft/transport/BlockGenericPipe.java
index 946e01a3..63953429 100644
--- a/common/buildcraft/transport/BlockGenericPipe.java
+++ b/common/buildcraft/transport/BlockGenericPipe.java
@@ -762,6 +762,11 @@ public class BlockGenericPipe extends BlockBuildCraft {
 				if (addOrStripWire(player, pipe, PipeWire.YELLOW)) {
 					return true;
 				}
+			} else if (currentItem.getItem() == Items.water_bucket) {
+				if (!world.isRemote) {
+					pipe.container.setColor(-1);
+				}
+				return true;
 			} else if (currentItem.getItem() instanceof ItemGate) {
 				if (addOrStripGate(world, x, y, z, player, ForgeDirection.getOrientation(side), pipe)) {
 					return true;
@@ -1303,6 +1308,17 @@ public class BlockGenericPipe extends BlockBuildCraft {
 		return super.colorMultiplier(world, x, y, z);
 	}
 
+	@Override
+	public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) {
+		TileGenericPipe pipeTile = (TileGenericPipe) world.getTileEntity(x, y, z);
+		if (!pipeTile.hasPlug(side)) {
+			pipeTile.setColor(colour);
+			return true;
+		}
+
+		return false;
+	}
+
 	public static void updateNeighbourSignalState(Pipe<?> pipe) {
 		TileBuffer[] neighbours = pipe.container.getTileCache();
 
diff --git a/common/buildcraft/transport/ItemPipe.java b/common/buildcraft/transport/ItemPipe.java
index be0a663e..f1ff169d 100644
--- a/common/buildcraft/transport/ItemPipe.java
+++ b/common/buildcraft/transport/ItemPipe.java
@@ -95,11 +95,11 @@ public class ItemPipe extends ItemBuildCraft implements IItemPipe {
 			if (BlockGenericPipe.placePipe(pipe, world, i, j, k, block, 0, entityplayer)) {
 				block.onBlockPlacedBy(world, i, j, k, entityplayer, itemstack);
 
-				if (!world.isRemote && itemstack.getItemDamage() >= 1) {
+				if (!world.isRemote) {
 					TileEntity tile = world.getTileEntity(i, j, k);
-					((TileGenericPipe) tile).glassColor = (itemstack.getItemDamage() - 1) & 15;
+					((TileGenericPipe) tile).initializeFromItemMetadata(itemstack.getItemDamage());
 				}
-				
+
 				// TODO: Fix sound
 				//world.playSoundEffect(i + 0.5F, j + 0.5F, k + 0.5F,
 				//		block.stepSound.getPlaceSound(),
diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java
index e1cbfb20..55793e9e 100644
--- a/common/buildcraft/transport/TileGenericPipe.java
+++ b/common/buildcraft/transport/TileGenericPipe.java
@@ -72,7 +72,6 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler,
 	public Pipe pipe;
 	public int redstoneInput;
 	public int[] redstoneInputSide = new int[ForgeDirection.VALID_DIRECTIONS.length];
-	public int glassColor = -1;
 	
 	protected boolean deletePipe = false;
 	protected boolean sendClientUpdate = false;
@@ -83,7 +82,8 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler,
 	protected boolean attachPluggables = false;
 
 	private TileBuffer[] tileBuffer;
-	
+	private int glassColor = -1;
+
 	public static class CoreState implements IClientState {
 		public int pipeId = -1;
 		public ItemGate.GatePluggable[] gates = new ItemGate.GatePluggable[ForgeDirection.VALID_DIRECTIONS.length];
@@ -420,20 +420,27 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler,
 		}
 	}
 
-	public int getItemMetadata() {
-		return 1 + (worldObj.isRemote ? renderState.glassColor : glassColor);
-	}
-	
-	public int getStainedColorMultiplier() {
-		int color;
-		
-		if (worldObj.isRemote) {
-			color = renderState.glassColor;
-		} else {
-			color = this.glassColor;
+	public void initializeFromItemMetadata(int i) {
+		if (i >= 1 && i <= 16) {
+			setColor((i - 1) & 15);
+		}
+	}
+
+	public int getItemMetadata() {
+		return (getColor() >= 0 ? (1 + getColor()) : 0);
+	}
+
+	public int getColor() {
+		return worldObj.isRemote ? renderState.glassColor : this.glassColor;
+	}
+
+	public void setColor(int color) {
+		// -1 = no color
+		if (!worldObj.isRemote && color >= -1 && color < 16) {
+			glassColor = color;
+			notifyBlockChanged();
+			worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
 		}
-		
-		return color >= 0 ? ColorUtils.getRGBColor(color) : -1;
 	}
 	
 	/**
diff --git a/common/buildcraft/transport/pipes/PipeItemsStripes.java b/common/buildcraft/transport/pipes/PipeItemsStripes.java
index 8f35dde9..01013af9 100644
--- a/common/buildcraft/transport/pipes/PipeItemsStripes.java
+++ b/common/buildcraft/transport/pipes/PipeItemsStripes.java
@@ -133,10 +133,10 @@ public class PipeItemsStripes extends Pipe<PipeTransportItems> implements IEnerg
 			}
 			
 			BuildCraftTransport.pipeItemsStripes.onItemUse(new ItemStack(
-					BuildCraftTransport.pipeItemsStripes, 1, this.container.glassColor), player, getWorld(), (int) p.x,
+					BuildCraftTransport.pipeItemsStripes, 1, this.container.getItemMetadata()), player, getWorld(), (int) p.x,
 					(int) p.y, (int) p.z, 1, 0, 0, 0
 				);
-			this.container.glassColor = stack.getItemDamage() - 1;
+			this.container.initializeFromItemMetadata(stack.getItemDamage() - 1);
 			
 			if (stack.stackSize > 0) {
 				TileEntity targetTile = getWorld().getTileEntity((int) p.x, (int) p.y, (int) p.z);
diff --git a/common/buildcraft/transport/render/PipeRendererWorld.java b/common/buildcraft/transport/render/PipeRendererWorld.java
index 9e60229b..d2e59d02 100644
--- a/common/buildcraft/transport/render/PipeRendererWorld.java
+++ b/common/buildcraft/transport/render/PipeRendererWorld.java
@@ -18,6 +18,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import buildcraft.BuildCraftTransport;
 import buildcraft.api.core.IIconProvider;
 import buildcraft.core.CoreConstants;
+import buildcraft.core.utils.ColorUtils;
 import buildcraft.core.utils.MatrixTranformations;
 import buildcraft.transport.PipeIconProvider;
 import buildcraft.transport.PipeRenderState;
@@ -33,19 +34,19 @@ public class PipeRendererWorld implements ISimpleBlockRenderingHandler {
 		PipeRenderState state = tile.renderState;
 		IIconProvider icons = tile.getPipeIcons();
 		FakeBlock fakeBlock = FakeBlock.INSTANCE;
-		int glassColorMultiplier = tile.getStainedColorMultiplier();
+		int glassColor = tile.getColor();
 		
 		if (icons == null) {
 			return;
 		}	
 
-		if (renderPass == 0 || glassColorMultiplier >= 0) {
+		if (renderPass == 0 || glassColor >= 0) {
 			// Pass 0 handles the pipe texture, pass 1 handles the transparent stained glass
 			int connectivity = state.pipeConnectionMatrix.getMask();
 			float[] dim = new float[6];
 			
 			if (renderPass == 1) {
-				fakeBlock.setColor(glassColorMultiplier);
+				fakeBlock.setColor(ColorUtils.getRGBColor(glassColor));
 			}
 	
 			// render the unconnected pipe faces of the center block (if any)

From 177eb3d9f14955c370260ec8f6fb98f7557452d5 Mon Sep 17 00:00:00 2001
From: asiekierka <kontakt@asie.pl>
Date: Sat, 13 Dec 2014 13:52:25 +0100
Subject: [PATCH 18/18] improve blueprint library text colors, add refreshing
 on GUI open (#2270)

---
 common/buildcraft/BuildCraftBuilders.java             |  2 +-
 common/buildcraft/builders/TileBlueprintLibrary.java  | 11 ++++++++---
 .../builders/blueprints/BlueprintDatabase.java        |  9 +++++++--
 .../buildcraft/builders/gui/GuiBlueprintLibrary.java  |  7 +++++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/common/buildcraft/BuildCraftBuilders.java b/common/buildcraft/BuildCraftBuilders.java
index 9ca50eed..c750944c 100644
--- a/common/buildcraft/BuildCraftBuilders.java
+++ b/common/buildcraft/BuildCraftBuilders.java
@@ -181,7 +181,7 @@ public class BuildCraftBuilders extends BuildCraftMod {
 						// legacy beta BuildCraft
 						"\"$MINECRAFT" + File.separator + "config" + File.separator + "buildcraft" + File.separator
 								+ "blueprints" + File.separator + "client\"",
-						// infered used download location
+						// inferred user download location
 						"\"" + getDownloadsDir() + "\""
 				}
 				).getStringList().clone();
diff --git a/common/buildcraft/builders/TileBlueprintLibrary.java b/common/buildcraft/builders/TileBlueprintLibrary.java
index 53c8868a..571ca8ec 100644
--- a/common/buildcraft/builders/TileBlueprintLibrary.java
+++ b/common/buildcraft/builders/TileBlueprintLibrary.java
@@ -58,13 +58,18 @@ public class TileBlueprintLibrary extends TileBuildCraft implements IInventory,
 
 	}
 
+	public void refresh() {
+		if (worldObj.isRemote) {
+			BuildCraftBuilders.clientDB.refresh();
+			setCurrentPage(BuildCraftBuilders.clientDB.getPage(pageId));
+		}
+	}
+
 	@Override
 	public void initialize() {
 		super.initialize();
 
-		if (worldObj.isRemote) {
-			setCurrentPage(BuildCraftBuilders.clientDB.getPage (pageId));
-		}
+		refresh();
 	}
 
 	public void setCurrentPage(ArrayList<BlueprintId> newPage) {
diff --git a/common/buildcraft/builders/blueprints/BlueprintDatabase.java b/common/buildcraft/builders/blueprints/BlueprintDatabase.java
index f73c6ed8..8bf434ac 100644
--- a/common/buildcraft/builders/blueprints/BlueprintDatabase.java
+++ b/common/buildcraft/builders/blueprints/BlueprintDatabase.java
@@ -35,7 +35,7 @@ public class BlueprintDatabase {
 	private File outputDir;
 	private File[] inputDirs;
 
-	private Set<BlueprintId> blueprintIds = new TreeSet<BlueprintId>();
+	private Set<BlueprintId> blueprintIds;
 	private BlueprintId [] pages = new BlueprintId [0];
 
 	/**
@@ -56,6 +56,11 @@ public class BlueprintDatabase {
 			inputDirs[i] = new File(inputPaths[i]);
 		}
 
+		refresh();
+	}
+
+	public void refresh() {
+		blueprintIds = new TreeSet<BlueprintId>();
 		loadIndex(inputDirs);
 	}
 
@@ -187,7 +192,7 @@ public class BlueprintDatabase {
 				}
 			}
 
-			pages = blueprintIds.toArray(pages);
+			pages = blueprintIds.toArray(new BlueprintId[blueprintIds.size()]);
 		}
 	}
 
diff --git a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java
index 762b8e6c..993c8ff3 100644
--- a/common/buildcraft/builders/gui/GuiBlueprintLibrary.java
+++ b/common/buildcraft/builders/gui/GuiBlueprintLibrary.java
@@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ResourceLocation;
 
 import buildcraft.BuildCraftBuilders;
+import buildcraft.BuildCraftCore;
 import buildcraft.builders.TileBlueprintLibrary;
 import buildcraft.builders.blueprints.BlueprintId;
 import buildcraft.builders.blueprints.BlueprintId.Kind;
@@ -52,6 +53,8 @@ public class GuiBlueprintLibrary extends GuiBuildCraft {
 		deleteButton = new GuiButton(2, guiLeft + 158, guiTop + 114, 25, 20, StringUtils.localize("gui.del"));
 		buttonList.add(deleteButton);
 
+		library.refresh();
+
 		checkDelete();
 		checkPages();
 	}
@@ -74,14 +77,14 @@ public class GuiBlueprintLibrary extends GuiBuildCraft {
 				int i2 = 24;
 
 				if (bpt.kind == Kind.Blueprint) {
-					drawGradientRect(l1, i2 + 9 * c, l1 + 146, i2 + 9 * (c + 1), 0xFFA0A0FF, 0xFFA0A0FF);
+					drawGradientRect(l1, i2 + 9 * c, l1 + 146, i2 + 9 * (c + 1), 0xFFA0C0F0, 0xFFA0C0F0);
 				} else {
 					drawGradientRect(l1, i2 + 9 * c, l1 + 146, i2 + 9 * (c + 1), 0x80ffffff, 0x80ffffff);
 				}
 			}
 
 			if (bpt.kind == Kind.Blueprint) {
-				fontRendererObj.drawString(name, 9, 25 + 9 * c, 0x1000FF);
+				fontRendererObj.drawString(name, 9, 25 + 9 * c, 0x305080);
 			} else {
 				fontRendererObj.drawString(name, 9, 25 + 9 * c, 0x000000);
 			}