Update to 1.5.1

By: Benjamin James Harrison-Sims <tehrainbowguy@gmail.com>

CraftBukkit-Patches/0018-Better-more-flexible-itemstack-merging.patch

@@ -1,4 +1,4 @@
-From 8379b6c5ada2d27070c6dc223accf351f190a3a6 Mon Sep 17 00:00:00 2001
+From a4b236f3fce26060a2a4751d6fa0f113c6cc75e6 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Fri, 25 Jan 2013 18:24:54 +1100
 Subject: [PATCH] Better + more flexible itemstack merging
@@ -40,7 +40,7 @@ index aa8d83f..bc69f5d 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d1be7c3..5cf6bc6 100644
+index b5c5e36..ba37de6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -948,31 +948,8 @@ public abstract class World implements IBlockAccess {
@@ -89,5 +89,5 @@ index d1be7c3..5cf6bc6 100644
              event = CraftEventFactory.callProjectileLaunchEvent(entity);
          }
 -- 
-1.8.1-rc2
+1.8.2