Update to 1.7.5

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From d5dbd54e27e10e47e7efa1537a9e90d322d79762 Mon Sep 17 00:00:00 2001
+From 518136605c7088117a448666a234b09d6e40b60f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -6,7 +6,7 @@ Subject: [PATCH] Merge tweaks and configuration
 This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index bbcf674..08b9ac8 100644
+index 8343ac9..95beb11 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -117,7 +117,10 @@ public class EntityItem extends Entity {
@@ -41,10 +41,10 @@ index bbcf674..08b9ac8 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 069db6a..164d268 100644
+index 9dc2d73..d023889 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -934,6 +934,23 @@ public abstract class World implements IBlockAccess {
+@@ -931,6 +931,23 @@ public abstract class World implements IBlockAccess {
              // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
              event = CraftEventFactory.callProjectileLaunchEvent(entity);
          }
@@ -92,5 +92,5 @@ index 7e79ba5..1545a61 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.5.2.msysgit.0