diff --git a/Bukkit-Patches/0004-BungeeCord-Support.patch b/Bukkit-Patches/0004-BungeeCord-Support.patch
index 7342b1b..2c072a6 100644
--- a/Bukkit-Patches/0004-BungeeCord-Support.patch
+++ b/Bukkit-Patches/0004-BungeeCord-Support.patch
@@ -1,14 +1,14 @@
-From 635849b293923601730cdf18a99a9437b6fa2a96 Mon Sep 17 00:00:00 2001
+From 3583afb047a67596bbb720659a18e2cb7fe2d6cf Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:20:49 +1000
 Subject: [PATCH] BungeeCord Support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 229a71a..31526a3 100644
+index 1d0daaf..4d5df12 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1037,4 +1037,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1035,4 +1035,23 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       * @see Player#setHealthScaled(boolean)
       */
      public double getHealthScale();
diff --git a/Bukkit-Patches/0006-Add-Particle-API.patch b/Bukkit-Patches/0006-Add-Particle-API.patch
index 114604b..03e8f15 100644
--- a/Bukkit-Patches/0006-Add-Particle-API.patch
+++ b/Bukkit-Patches/0006-Add-Particle-API.patch
@@ -1,4 +1,4 @@
-From 01f99fc968bc61b744aadedbbce25d2ed91fcf6c Mon Sep 17 00:00:00 2001
+From d36e3167d05889a0550cb8619a3e006eb4fa3385 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:57:09 +1000
 Subject: [PATCH] Add Particle API
@@ -332,10 +332,10 @@ index 127ad9d..6613286 100644
       * Gets the world border for this world.
       *
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 31526a3..0810c68 100644
+index 4d5df12..9b9676e 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1052,6 +1052,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1050,6 +1050,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0012-Player-Collision-API.patch b/Bukkit-Patches/0012-Player-Collision-API.patch
index b442904..3d22e6a 100644
--- a/Bukkit-Patches/0012-Player-Collision-API.patch
+++ b/Bukkit-Patches/0012-Player-Collision-API.patch
@@ -1,14 +1,14 @@
-From a8a5d39f2fd96465b66ec5f9f17a8a6ae3bda9f5 Mon Sep 17 00:00:00 2001
+From 50902f491aee86ed6c8fbf37e331dbd670427bb7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 3 Aug 2013 19:20:50 +1000
 Subject: [PATCH] Player Collision API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 0810c68..597bca1 100644
+index 9b9676e..3830926 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1057,6 +1057,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1055,6 +1055,27 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0015-Add-respawn-API.patch b/Bukkit-Patches/0015-Add-respawn-API.patch
index 3cdd897..38f6d1d 100644
--- a/Bukkit-Patches/0015-Add-respawn-API.patch
+++ b/Bukkit-Patches/0015-Add-respawn-API.patch
@@ -1,14 +1,14 @@
-From f07f6b66ac42640bcd481710667e02ba494f29be Mon Sep 17 00:00:00 2001
+From 180cc2c3b3b88ad2dce7765e001870ffb9b26849 Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:35:58 +0200
 Subject: [PATCH] Add respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 597bca1..da4da7c 100644
+index 3830926..c8110fb 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1078,6 +1078,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1076,6 +1076,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
index 049bac5..e12df36 100644
--- a/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
+++ b/Bukkit-Patches/0018-Implement-Locale-Getter-for-Players.patch
@@ -1,14 +1,14 @@
-From 5958f1a4d759ddbb6df71a76dce144d979ee94d7 Mon Sep 17 00:00:00 2001
+From 2ed86fd19fa6146e1183c0f2af6ed9326f71be9d Mon Sep 17 00:00:00 2001
 From: Smove <jan@lavasurvival.net>
 Date: Sat, 1 Feb 2014 18:10:49 +1100
 Subject: [PATCH] Implement Locale Getter for Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index da4da7c..57e6eae 100644
+index c8110fb..dc108f2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1086,6 +1086,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1084,6 +1084,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
index 3227acc..7f2dc28 100644
--- a/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
+++ b/Bukkit-Patches/0019-Add-support-for-fetching-hidden-players.patch
@@ -1,14 +1,14 @@
-From b3f637a30ead745921e73bc6bf54be21bc25b23a Mon Sep 17 00:00:00 2001
+From 64f289718617d9d41047c022adfbc21a68d291a2 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Sun, 9 Feb 2014 14:02:11 -0500
 Subject: [PATCH] Add support for fetching hidden players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 57e6eae..7ed0f6a 100644
+index dc108f2..24956d1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1096,6 +1096,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1094,6 +1094,16 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch b/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch
similarity index 93%
rename from Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch
rename to Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch
index 42d373b..3188080 100644
--- a/Bukkit-Patches/0023-Add-Score.isScoreSet-Z-API.patch
+++ b/Bukkit-Patches/0022-Add-Score.isScoreSet-Z-API.patch
@@ -1,4 +1,4 @@
-From cf631eb590b0bd2757c43114604659679251b8d9 Mon Sep 17 00:00:00 2001
+From 13cf271e46dd3ab8974491f621a5be427e40e5ce Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:13 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.
diff --git a/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch b/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
deleted file mode 100644
index 0b85123..0000000
--- a/Bukkit-Patches/0022-Expand-team-API-to-allow-arbitrary-strings.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 9c4aae143d9dc26ef36e30c819fa4ad97f9801cb Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Thu, 17 Apr 2014 19:22:26 +1000
-Subject: [PATCH] Expand team API to allow arbitrary strings.
-
-
-diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index e6d1442..2bd78e3 100644
---- a/src/main/java/org/bukkit/scoreboard/Team.java
-+++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -134,6 +134,15 @@ public interface Team {
-      */
-     Set<OfflinePlayer> getPlayers() throws IllegalStateException;
- 
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #getPlayers()
-+     */
-+    Set<String> getEntries() throws IllegalStateException;
-+    // Spigot End
-+
-     /**
-      * Gets the size of the team
-      *
-@@ -161,6 +170,15 @@ public interface Team {
-      */
-     void addPlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
- 
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #addPlayer(org.bukkit.OfflinePlayer)
-+     */
-+    void addEntry(String entry) throws IllegalStateException, IllegalArgumentException;
-+    // Spigot end
-+
-     /**
-      * Removes the player from this team.
-      *
-@@ -171,6 +189,15 @@ public interface Team {
-      */
-     boolean removePlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException;
- 
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #removePlayer(org.bukkit.OfflinePlayer)
-+     */
-+    boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException;
-+    // Spigot end
-+
-     /**
-      * Unregisters this team from the Scoreboard
-      *
-@@ -187,4 +214,13 @@ public interface Team {
-      * @throws IllegalStateException if this team has been unregistered
-      */
-     boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException;
-+
-+    // Spigot start
-+    /**
-+     * Same as the player method, but with an arbitrary string.
-+     *
-+     * @see #hasPlayer(org.bukkit.OfflinePlayer)
-+     */
-+    boolean hasEntry(String entry) throws IllegalArgumentException,IllegalStateException;
-+    // Spigot end
- }
--- 
-2.1.4
-
diff --git a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch b/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch
similarity index 96%
rename from Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch
rename to Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch
index ba31d1e..7853013 100644
--- a/Bukkit-Patches/0024-Add-PlayerSpawnLocationEvent.patch
+++ b/Bukkit-Patches/0023-Add-PlayerSpawnLocationEvent.patch
@@ -1,4 +1,4 @@
-From da0f36b3061dede561dfab0e831e555fc8a71886 Mon Sep 17 00:00:00 2001
+From bd34256ce7ea719485ccfe6819ac71e75eb438a2 Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:01:32 +0200
 Subject: [PATCH] Add PlayerSpawnLocationEvent.
diff --git a/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch b/Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch
similarity index 98%
rename from Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch
rename to Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch
index aadc638..91f9072 100644
--- a/Bukkit-Patches/0025-Ease-ClassLoader-Deadlocks-Where-Possible.patch
+++ b/Bukkit-Patches/0024-Ease-ClassLoader-Deadlocks-Where-Possible.patch
@@ -1,4 +1,4 @@
-From a62698171547806cae2eb4b3cac7408c01b6c074 Mon Sep 17 00:00:00 2001
+From 0e0c236ada77b513050d04b43f9fb37ba87f9a67 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 16 Jul 2014 17:24:21 +1000
 Subject: [PATCH] Ease ClassLoader Deadlocks Where Possible
diff --git a/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch b/Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch
similarity index 94%
rename from Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch
rename to Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch
index fe46d72..7971b3b 100644
--- a/Bukkit-Patches/0026-Fix-slow-tab-complete-for-some-commands.patch
+++ b/Bukkit-Patches/0025-Fix-slow-tab-complete-for-some-commands.patch
@@ -1,4 +1,4 @@
-From 03ba1b9d5a03c6c9632efb0f845ee707fe8d652a Mon Sep 17 00:00:00 2001
+From 774a23e8786db836f122b52878efb4ee6c09d5de Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 22 Jul 2014 21:01:32 +1000
 Subject: [PATCH] Fix slow tab complete for some commands.
diff --git a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch b/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch
similarity index 81%
rename from Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch
rename to Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch
index f19debb..a6117a4 100644
--- a/Bukkit-Patches/0027-Undeprecate-Player-updateInventory-V.patch
+++ b/Bukkit-Patches/0026-Undeprecate-Player-updateInventory-V.patch
@@ -1,14 +1,14 @@
-From 12038bfe5f1bbfb36a0e0b74528c3680a02b2794 Mon Sep 17 00:00:00 2001
+From ae0e8af3697605661785760ebad7c0dc0de118cd Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Wed, 23 Jul 2014 15:50:36 -0400
 Subject: [PATCH] Undeprecate Player#updateInventory()V
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 7ed0f6a..b55d70e 100644
+index 24956d1..40fbb53 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -334,10 +334,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -332,10 +332,8 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
      /**
       * Forces an update of the player's entire inventory.
       *
diff --git a/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
similarity index 95%
rename from Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
rename to Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
index 5e305ac..4088745 100644
--- a/Bukkit-Patches/0028-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
+++ b/Bukkit-Patches/0027-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
@@ -1,4 +1,4 @@
-From bba59a058b2f6d6bd80355d6cd9a5f376fe7825d Mon Sep 17 00:00:00 2001
+From 9b7a6f1d7eb97b23e5322809c9b2345bcc8da128 Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:31:04 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
diff --git a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch
similarity index 94%
rename from Bukkit-Patches/0029-BungeeCord-Chat-API.patch
rename to Bukkit-Patches/0028-BungeeCord-Chat-API.patch
index 55d88f6..25775e6 100644
--- a/Bukkit-Patches/0029-BungeeCord-Chat-API.patch
+++ b/Bukkit-Patches/0028-BungeeCord-Chat-API.patch
@@ -1,4 +1,4 @@
-From e560ebe0d6fc9f8683b34f901a4fc8005d182d41 Mon Sep 17 00:00:00 2001
+From 88ea28b160d00ad290a7cb851d25ea324b1b0365 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 12:59:14 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -53,10 +53,10 @@ index 57b2794..cf4ab1d 100644
  
      Spigot spigot();
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b55d70e..8eb781e 100644
+index 40fbb53..b86b85d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1104,6 +1104,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
+@@ -1102,6 +1102,24 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
          {
              throw new UnsupportedOperationException( "Not supported yet." );
          }
diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index 7e23002..78cf4e2 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From 24bfb6d05f0a60acec83e0327d4c042d6f17ed12 Mon Sep 17 00:00:00 2001
+From 8169ad820d152c10a26d015417d0070f851c8b9e Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -159,37 +159,6 @@ index d3ae91b..0b71b53 100644
 +        throw new UnsupportedOperationException("Not supported yet.");
 +    }
 +    // Spigot end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index ce42b30..342d4af 100644
---- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -212,5 +212,26 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
-     }
- 
-+    // Spigot start
-+    @Override
-+    public Set<String> getEntries() throws IllegalStateException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+
-+    @Override
-+    public void addEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+
-+    @Override
-+    public boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+
-+    @Override
-+    public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
-+        throw new UnsupportedOperationException("Not supported yet.");
-+    }
-+    // Spigot end
- 
  }
 -- 
 2.1.4
diff --git a/CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch b/CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch
similarity index 93%
rename from CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch
rename to CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch
index 03cc95f..50f4484 100644
--- a/CraftBukkit-Patches/0109-Add-Score.isScoreSet-Z-API.patch
+++ b/CraftBukkit-Patches/0108-Add-Score.isScoreSet-Z-API.patch
@@ -1,4 +1,4 @@
-From 4b01ba741f539605915bfb6ed79baf75b1730fd4 Mon Sep 17 00:00:00 2001
+From ac591808f6b285a545b202209f99a23d208b9af7 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Thu, 17 Apr 2014 19:35:53 +1000
 Subject: [PATCH] Add Score.isScoreSet()Z API.
diff --git a/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch b/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch
deleted file mode 100644
index 2ab903e..0000000
--- a/CraftBukkit-Patches/0108-Expand-team-API-to-allow-arbitrary-strings.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 2564a4f795b3ba3b8f211282e933b2c03e670cc5 Mon Sep 17 00:00:00 2001
-From: md_5 <git@md-5.net>
-Date: Thu, 17 Apr 2014 19:22:22 +1000
-Subject: [PATCH] Expand team API to allow arbitrary strings.
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 342d4af..6b7233e 100644
---- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -115,6 +115,19 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         return players.build();
-     }
- 
-+    // Spigot start
-+    @Override
-+    public Set<String> getEntries() throws IllegalStateException {
-+        CraftScoreboard scoreboard = checkState();
-+        
-+        ImmutableSet.Builder<String> entries = ImmutableSet.builder();
-+        for (Object o : team.getPlayerNameSet()){
-+            entries.add(o.toString());
-+        }
-+        return entries.build();
-+    }
-+    // Spigot end
-+
-     public int getSize() throws IllegalStateException {
-         CraftScoreboard scoreboard = checkState();
- 
-@@ -123,28 +136,50 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
- 
-     public void addPlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException {
-         Validate.notNull(player, "OfflinePlayer cannot be null");
-+        // Spigot Start
-+        addEntry(player.getName());
-+    }
-+    
-+    public void addEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        Validate.notNull(entry, "Entry cannot be null");
-         CraftScoreboard scoreboard = checkState();
- 
--        scoreboard.board.addPlayerToTeam(player.getName(), team.getName());
-+        scoreboard.board.addPlayerToTeam(entry, team.getName());
-+        // Spigot end
-     }
- 
-     public boolean removePlayer(OfflinePlayer player) throws IllegalStateException, IllegalArgumentException {
-         Validate.notNull(player, "OfflinePlayer cannot be null");
-+        // Spigot start
-+        return removeEntry(player.getName());
-+    }
-+    
-+    public boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException {
-+        Validate.notNull(entry, "Entry cannot be null");
-         CraftScoreboard scoreboard = checkState();
- 
--        if (!team.getPlayerNameSet().contains(player.getName())) {
-+        if (!team.getPlayerNameSet().contains(entry)) {
-             return false;
-         }
- 
--        scoreboard.board.removePlayerFromTeam(player.getName(), team);
-+        scoreboard.board.removePlayerFromTeam(entry, team);
-+        // Spigot end
-         return true;
-     }
- 
-     public boolean hasPlayer(OfflinePlayer player) throws IllegalArgumentException, IllegalStateException {
-         Validate.notNull(player, "OfflinePlayer cannot be null");
-+        // Spigot start
-+        return hasEntry(player.getName());
-+    }
-+
-+    public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
-+        Validate.notNull("Entry cannot be null");
-+
-         CraftScoreboard scoreboard = checkState();
- 
--        return team.getPlayerNameSet().contains(player.getName());
-+        return team.getPlayerNameSet().contains(entry);
-+        // Spigot end
-     }
- 
-     @Override
-@@ -211,27 +246,6 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
-         final CraftTeam other = (CraftTeam) obj;
-         return !(this.team != other.team && (this.team == null || !this.team.equals(other.team)));
-     }
--
--    // Spigot start
--    @Override
--    public Set<String> getEntries() throws IllegalStateException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
--
--    @Override
--    public void addEntry(String entry) throws IllegalStateException, IllegalArgumentException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
--
--    @Override
--    public boolean removeEntry(String entry) throws IllegalStateException, IllegalArgumentException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
--
--    @Override
--    public boolean hasEntry(String entry) throws IllegalArgumentException, IllegalStateException {
--        throw new UnsupportedOperationException("Not supported yet.");
--    }
-     // Spigot end
- 
- }
--- 
-2.1.4
-
diff --git a/CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch b/CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch
similarity index 95%
rename from CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch
rename to CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch
index 6ea0792..e653cd4 100644
--- a/CraftBukkit-Patches/0110-Log-null-TileEntity-Owner.patch
+++ b/CraftBukkit-Patches/0109-Log-null-TileEntity-Owner.patch
@@ -1,4 +1,4 @@
-From c21304e88c5f05f474c2f6712e84fc188afa86d0 Mon Sep 17 00:00:00 2001
+From 7c561ed9b8e1e17a67195e93442bfbc39f7cf2a4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 11:16:54 +1000
 Subject: [PATCH] Log null TileEntity Owner
diff --git a/CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch b/CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch
similarity index 91%
rename from CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch
rename to CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch
index c77b7ac..2c78687 100644
--- a/CraftBukkit-Patches/0111-Don-t-special-case-invalid-usernames-for-UUIDs.patch
+++ b/CraftBukkit-Patches/0110-Don-t-special-case-invalid-usernames-for-UUIDs.patch
@@ -1,11 +1,11 @@
-From 161fb596c2c9bf7210385465a01684617e3d9741 Mon Sep 17 00:00:00 2001
+From d54f1555b93868d463296dc1a252a59810b1c3f0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 20 Apr 2014 18:58:00 +1000
 Subject: [PATCH] Don't special case 'invalid' usernames for UUIDs.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 982d95e..9328d8e 100644
+index 438f4b1..da6c5cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1293,11 +1293,6 @@ public final class CraftServer implements Server {
diff --git a/CraftBukkit-Patches/0112-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0111-Convert-player-skulls-async.patch
similarity index 99%
rename from CraftBukkit-Patches/0112-Convert-player-skulls-async.patch
rename to CraftBukkit-Patches/0111-Convert-player-skulls-async.patch
index 6b55f70..1938921 100644
--- a/CraftBukkit-Patches/0112-Convert-player-skulls-async.patch
+++ b/CraftBukkit-Patches/0111-Convert-player-skulls-async.patch
@@ -1,4 +1,4 @@
-From 32d4495b672dfb5bc4a79ab1fcbdd167fcff7b90 Mon Sep 17 00:00:00 2001
+From a5b4204aa8f6ce756b0b068039fdd9d901efc6e5 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Sun, 20 Apr 2014 13:18:55 +0100
 Subject: [PATCH] Convert player skulls async
diff --git a/CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch b/CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
similarity index 97%
rename from CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
rename to CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
index 37bbeed..7569a09 100644
--- a/CraftBukkit-Patches/0113-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
+++ b/CraftBukkit-Patches/0112-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
@@ -1,4 +1,4 @@
-From 6187e07d8919fe778e4943406782200a44cc4c5b Mon Sep 17 00:00:00 2001
+From 39df267e1372fcfc297c1506f49fd3dc73a7651a Mon Sep 17 00:00:00 2001
 From: David <dmck2b@gmail.com>
 Date: Mon, 21 Apr 2014 12:43:08 +0100
 Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
diff --git a/CraftBukkit-Patches/0114-Check-Skull-canPlace.patch b/CraftBukkit-Patches/0113-Check-Skull-canPlace.patch
similarity index 93%
rename from CraftBukkit-Patches/0114-Check-Skull-canPlace.patch
rename to CraftBukkit-Patches/0113-Check-Skull-canPlace.patch
index 879a941..6723032 100644
--- a/CraftBukkit-Patches/0114-Check-Skull-canPlace.patch
+++ b/CraftBukkit-Patches/0113-Check-Skull-canPlace.patch
@@ -1,4 +1,4 @@
-From 12ddf21a211853e5594ea9469e119281d3a5b329 Mon Sep 17 00:00:00 2001
+From 2c50d97a886dfdfd30bb45ff6483d7fbd79d3495 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 15 Apr 2014 10:48:35 +1000
 Subject: [PATCH] Check Skull canPlace
diff --git a/CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch
similarity index 97%
rename from CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch
rename to CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch
index 90094c6..b35f230 100644
--- a/CraftBukkit-Patches/0115-Fix-race-condition-that-could-kill-connections-befor.patch
+++ b/CraftBukkit-Patches/0114-Fix-race-condition-that-could-kill-connections-befor.patch
@@ -1,4 +1,4 @@
-From 7a601109dc28da7f022dced48416bf8a1d76ab41 Mon Sep 17 00:00:00 2001
+From a84dfc81793602b69c1e24a72937e151155a1204 Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 25 Apr 2014 23:46:46 +0200
 Subject: [PATCH] Fix race condition that could kill connections before they
diff --git a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch b/CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch
similarity index 94%
rename from CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch
rename to CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch
index 37e61fd..17ee257 100644
--- a/CraftBukkit-Patches/0116-Configurable-UserCache-cap.patch
+++ b/CraftBukkit-Patches/0115-Configurable-UserCache-cap.patch
@@ -1,4 +1,4 @@
-From 083b5e02fc877acd03637dab3da618a64b53ba64 Mon Sep 17 00:00:00 2001
+From 8210134dc306c57f0531eb450e462d9a16a77e3f Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 25 Apr 2014 18:17:30 -0400
 Subject: [PATCH] Configurable UserCache cap
@@ -33,5 +33,5 @@ index 3a8734f..e88765b 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 
diff --git a/CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch b/CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch
similarity index 96%
rename from CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch
rename to CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch
index 8021b3c..de414f3 100644
--- a/CraftBukkit-Patches/0117-Implement-PlayerSpawnLocationEvent.patch
+++ b/CraftBukkit-Patches/0116-Implement-PlayerSpawnLocationEvent.patch
@@ -1,4 +1,4 @@
-From 3c242f100cf55d40bfebcefda6c87a8760834445 Mon Sep 17 00:00:00 2001
+From d291a5cfd2bc9cde7bfa23f9824f114db775a7f0 Mon Sep 17 00:00:00 2001
 From: ninja <xninja@openmailbox.org>
 Date: Tue, 8 Apr 2014 14:05:19 +0200
 Subject: [PATCH] Implement PlayerSpawnLocationEvent.
diff --git a/CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch b/CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch
similarity index 94%
rename from CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch
rename to CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch
index 6650111..320ee7a 100644
--- a/CraftBukkit-Patches/0118-Cap-Objective-Score-Length.patch
+++ b/CraftBukkit-Patches/0117-Cap-Objective-Score-Length.patch
@@ -1,4 +1,4 @@
-From 1cbaf4b56eb551cc0a8614a01f90a032ff8ee6cc Mon Sep 17 00:00:00 2001
+From a3c6e0bcb50f802a87947e916c20c3bd92394128 Mon Sep 17 00:00:00 2001
 From: hauno <imhauno@gmail.com>
 Date: Tue, 6 May 2014 18:01:37 -0700
 Subject: [PATCH] Cap Objective Score Length
diff --git a/CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch b/CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch
similarity index 93%
rename from CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch
rename to CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch
index f0c92a6..f7d50b0 100644
--- a/CraftBukkit-Patches/0119-Process-conversation-input-on-the-main-thread.-Fixes.patch
+++ b/CraftBukkit-Patches/0118-Process-conversation-input-on-the-main-thread.-Fixes.patch
@@ -1,4 +1,4 @@
-From 28abd81b8d9352989e362304b07e482c9980ced0 Mon Sep 17 00:00:00 2001
+From 0fdd332d639bb8d0a5e446d8297520e50198672c Mon Sep 17 00:00:00 2001
 From: riking <rikingcoding@gmail.com>
 Date: Wed, 14 May 2014 13:46:48 -0700
 Subject: [PATCH] Process conversation input on the main thread. Fixes
@@ -6,7 +6,7 @@ Subject: [PATCH] Process conversation input on the main thread. Fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ceb2419..0c095c9 100644
+index 7eb563b..43367dd 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -956,7 +956,18 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
diff --git a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch b/CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch
similarity index 96%
rename from CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch
rename to CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch
index b9a82c5..f756716 100644
--- a/CraftBukkit-Patches/0120-Configurable-save-on-stop-only-for-UserCache.patch
+++ b/CraftBukkit-Patches/0119-Configurable-save-on-stop-only-for-UserCache.patch
@@ -1,4 +1,4 @@
-From 72dea5f667ed31b110f1d183e736c1f0a437682d Mon Sep 17 00:00:00 2001
+From d2a17f5a8a4ca417760ffd6be8bf1ec5c706e42f Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Fri, 23 May 2014 18:05:10 -0400
 Subject: [PATCH] Configurable save-on-stop-only for UserCache
@@ -52,5 +52,5 @@ index e88765b..f35e92e 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 
diff --git a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch b/CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch
similarity index 97%
rename from CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch
rename to CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch
index f167765..b2e1999 100644
--- a/CraftBukkit-Patches/0121-Prevent-Unbounded-IntCache-Growth.patch
+++ b/CraftBukkit-Patches/0120-Prevent-Unbounded-IntCache-Growth.patch
@@ -1,4 +1,4 @@
-From 44a277191897011b8188d9cce87ef2e6f793f91e Mon Sep 17 00:00:00 2001
+From 3734c70c6d00a8ac38bca565d58632634d4b59eb Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Jun 2014 19:40:00 +1000
 Subject: [PATCH] Prevent Unbounded IntCache Growth
@@ -58,5 +58,5 @@ index f35e92e..921d7d5 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 
diff --git a/CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch b/CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch
similarity index 97%
rename from CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch
rename to CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch
index f7cb72f..c167daa 100644
--- a/CraftBukkit-Patches/0122-Add-damager-to-the-unhandled-error.patch
+++ b/CraftBukkit-Patches/0121-Add-damager-to-the-unhandled-error.patch
@@ -1,4 +1,4 @@
-From 32ec016f638bb49d395f6a38840da0d0142b1a05 Mon Sep 17 00:00:00 2001
+From 9f01e09fbee1a13e09d0f1673d54bd811a0df602 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 26 Jun 2014 23:42:52 +0100
 Subject: [PATCH] Add damager to the unhandled error
diff --git a/CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch b/CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch
similarity index 95%
rename from CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch
rename to CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch
index 24649dd..383b155 100644
--- a/CraftBukkit-Patches/0123-Cross-World-Entity-Teleportation.patch
+++ b/CraftBukkit-Patches/0122-Cross-World-Entity-Teleportation.patch
@@ -1,4 +1,4 @@
-From 3a1d0cc42f3a816457fc4a8f2218cad5bfdaa62f Mon Sep 17 00:00:00 2001
+From ca15a3af0bedf9fe18d1e5a96f6ae96d634f9d82 Mon Sep 17 00:00:00 2001
 From: Andrew Krieger <Slizyboy@hotmail.com>
 Date: Tue, 24 Dec 2013 07:55:23 -0800
 Subject: [PATCH] Cross World Entity Teleportation
diff --git a/CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch b/CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch
similarity index 97%
rename from CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch
rename to CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch
index 7f4ff9e..0390013 100644
--- a/CraftBukkit-Patches/0124-Limit-block-placement-interaction-packets.patch
+++ b/CraftBukkit-Patches/0123-Limit-block-placement-interaction-packets.patch
@@ -1,4 +1,4 @@
-From c43b4f0ff90f4acfd68c78fff336323de82178cf Mon Sep 17 00:00:00 2001
+From 35ce22ac6fc7b882a7beddf9e63b98b503816c35 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sun, 29 Jun 2014 21:10:34 +0100
 Subject: [PATCH] Limit block placement/interaction packets
@@ -24,7 +24,7 @@ index c611db1..28cb5e3 100644
      public void b(PacketDataSerializer packetdataserializer) throws IOException {}
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0c095c9..2469f48 100644
+index 43367dd..aac4851 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -628,9 +628,22 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
diff --git a/CraftBukkit-Patches/0125-Better-item-validation.patch b/CraftBukkit-Patches/0124-Better-item-validation.patch
similarity index 99%
rename from CraftBukkit-Patches/0125-Better-item-validation.patch
rename to CraftBukkit-Patches/0124-Better-item-validation.patch
index 8c52c2f..18c6bcb 100644
--- a/CraftBukkit-Patches/0125-Better-item-validation.patch
+++ b/CraftBukkit-Patches/0124-Better-item-validation.patch
@@ -1,4 +1,4 @@
-From f796a42fe3d389abc18238e7c6b71a0c58c3af69 Mon Sep 17 00:00:00 2001
+From 6a97359cf5acd2a387fce2f4f40bd85b5fa11ac8 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Wed, 2 Jul 2014 23:35:51 +0100
 Subject: [PATCH] Better item validation
diff --git a/CraftBukkit-Patches/0126-Further-Seed-Customisation.patch b/CraftBukkit-Patches/0125-Further-Seed-Customisation.patch
similarity index 97%
rename from CraftBukkit-Patches/0126-Further-Seed-Customisation.patch
rename to CraftBukkit-Patches/0125-Further-Seed-Customisation.patch
index 662085f..cd424a9 100644
--- a/CraftBukkit-Patches/0126-Further-Seed-Customisation.patch
+++ b/CraftBukkit-Patches/0125-Further-Seed-Customisation.patch
@@ -1,4 +1,4 @@
-From 96a38108d0cf838f7ed2fa3f16c4f6641864b0bd Mon Sep 17 00:00:00 2001
+From f7c49aaa0a88a5678bd4aa6b27d5cfa7cfc1e775 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 4 Jul 2014 13:28:45 +1000
 Subject: [PATCH] Further Seed Customisation
diff --git a/CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch b/CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch
similarity index 93%
rename from CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch
rename to CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch
index b18dc15..2066808 100644
--- a/CraftBukkit-Patches/0127-Disable-ResourceLeakDetector.patch
+++ b/CraftBukkit-Patches/0126-Disable-ResourceLeakDetector.patch
@@ -1,4 +1,4 @@
-From da5e7a60d7367e9f35af3ad977c6e2fc1148570a Mon Sep 17 00:00:00 2001
+From 6e91742926a10865ffbfe599df58ab11b97c1ff4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 09:01:50 +1000
 Subject: [PATCH] Disable ResourceLeakDetector
diff --git a/CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch b/CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch
similarity index 96%
rename from CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch
rename to CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch
index 67e7277..a411c02 100644
--- a/CraftBukkit-Patches/0128-Add-More-Information-to-session.lock-Errors.patch
+++ b/CraftBukkit-Patches/0127-Add-More-Information-to-session.lock-Errors.patch
@@ -1,4 +1,4 @@
-From e650175d8ae7c08174bb6d29fb0eccf193800932 Mon Sep 17 00:00:00 2001
+From 7bf14ededcffd1ec98669c90ce86a6d79d30d29c Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Sat, 5 Jul 2014 16:56:44 +0100
 Subject: [PATCH] Add More Information to session.lock Errors
diff --git a/CraftBukkit-Patches/0129-Safer-JSON-Loading.patch b/CraftBukkit-Patches/0128-Safer-JSON-Loading.patch
similarity index 97%
rename from CraftBukkit-Patches/0129-Safer-JSON-Loading.patch
rename to CraftBukkit-Patches/0128-Safer-JSON-Loading.patch
index 73315a7..eb7b5a5 100644
--- a/CraftBukkit-Patches/0129-Safer-JSON-Loading.patch
+++ b/CraftBukkit-Patches/0128-Safer-JSON-Loading.patch
@@ -1,4 +1,4 @@
-From 833b73d4c5e179449cdadc2fe7c32fd83a92cf67 Mon Sep 17 00:00:00 2001
+From 266eddeec4ac76df87e382808330cb2fb95c77d9 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 8 Jul 2014 09:44:18 +1000
 Subject: [PATCH] Safer JSON Loading
diff --git a/CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch b/CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch
similarity index 90%
rename from CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch
rename to CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch
index eb6184d..7a9997e 100644
--- a/CraftBukkit-Patches/0130-Fix-Slow-Loading-Libraries.patch
+++ b/CraftBukkit-Patches/0129-Fix-Slow-Loading-Libraries.patch
@@ -1,4 +1,4 @@
-From ea093f5f64763bd5fb4d31c9f0795073cf38ca0c Mon Sep 17 00:00:00 2001
+From 507611b0cee04c9555cc42dc4cee770e1019c1a4 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 8 Jul 2014 20:27:52 +1000
 Subject: [PATCH] Fix Slow "Loading Libraries"
diff --git a/CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch b/CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch
similarity index 95%
rename from CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch
rename to CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch
index 0dcf38a..8460a8c 100644
--- a/CraftBukkit-Patches/0131-Add-CommandLine-EULA-Flag.patch
+++ b/CraftBukkit-Patches/0130-Add-CommandLine-EULA-Flag.patch
@@ -1,4 +1,4 @@
-From f32a9920cf444a9803fc041d2de0f49486564d29 Mon Sep 17 00:00:00 2001
+From 249f0a660eafaf4b0df4b8684a4b5d1778d74df0 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Wed, 9 Jul 2014 10:35:44 +1000
 Subject: [PATCH] Add CommandLine EULA Flag
@@ -8,7 +8,7 @@ This flag contains the same message as eula.txt (albeit with proper grammar for
 This feature only exists for hosting companies and people who manage servers in bulk who wish to agree to the terms by setting a flag in a script.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 76cc16d..ebb18c6 100644
+index ad4e370..15d161d 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -123,7 +123,16 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
diff --git a/CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch b/CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
similarity index 94%
rename from CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
rename to CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
index 509427a..065881b 100644
--- a/CraftBukkit-Patches/0132-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
+++ b/CraftBukkit-Patches/0131-Fix-for-enchanting-table-wiping-meta-when-placing-st.patch
@@ -1,4 +1,4 @@
-From 41f2230ba8fcd520bd55fc2feb74544ccb4557ef Mon Sep 17 00:00:00 2001
+From ca5124acaa38d7d01b316301270ca6db84551ee3 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Thu, 17 Jul 2014 21:13:15 -0400
 Subject: [PATCH] Fix for enchanting table wiping meta when placing stacked
diff --git a/CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
similarity index 96%
rename from CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
rename to CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
index 27d6098..00c78da 100644
--- a/CraftBukkit-Patches/0133-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
+++ b/CraftBukkit-Patches/0132-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
@@ -1,4 +1,4 @@
-From cf4417feddf83beb2b4a607975ca24287b871031 Mon Sep 17 00:00:00 2001
+From c26fbc5b08948719bb930de97d5dd4099c599b0e Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 12:49:48 +0100
 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
diff --git a/CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch b/CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch
similarity index 95%
rename from CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch
rename to CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch
index 22fcf43..4b02a2f 100644
--- a/CraftBukkit-Patches/0134-Prevent-a-crash-involving-attributes.patch
+++ b/CraftBukkit-Patches/0133-Prevent-a-crash-involving-attributes.patch
@@ -1,4 +1,4 @@
-From b55560bcefc38649df64183e9a01462208e3601f Mon Sep 17 00:00:00 2001
+From af60d408c86a2a7cd143b9175e7ee7fcfaf41b19 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Sat, 19 Jul 2014 19:54:41 +0100
 Subject: [PATCH] Prevent a crash involving attributes
diff --git a/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch b/CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch
similarity index 93%
rename from CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch
rename to CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch
index e7087ac..75d77d6 100644
--- a/CraftBukkit-Patches/0135-Make-moved-wrongly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0134-Make-moved-wrongly-limit-configurable.patch
@@ -1,11 +1,11 @@
-From 8e4e7ddb561ab48c6ed60a4f4fbbdf6cc2ed30c1 Mon Sep 17 00:00:00 2001
+From 2a051abfaab23203d7db975a4041842f2b333b5e Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Fri, 4 Jul 2014 23:03:13 +0200
 Subject: [PATCH] Make "moved wrongly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2469f48..3fe7038 100644
+index aac4851..54bc1b0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -417,7 +417,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -34,5 +34,5 @@ index 921d7d5..7e774f2 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 
diff --git a/CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch b/CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch
similarity index 91%
rename from CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch
rename to CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch
index e4a5183..6ad976a 100644
--- a/CraftBukkit-Patches/0136-Fix-Null-Tile-Entity-Worlds.patch
+++ b/CraftBukkit-Patches/0135-Fix-Null-Tile-Entity-Worlds.patch
@@ -1,4 +1,4 @@
-From 0afdaf18e32361170492c4ec0d4c490caaaf5d20 Mon Sep 17 00:00:00 2001
+From ceb7ce10626fb3d88fc647028c559741065ae96c Mon Sep 17 00:00:00 2001
 From: "Evan A. Haskell" <eah2119@gmail.com>
 Date: Thu, 26 Jun 2014 18:37:29 -0400
 Subject: [PATCH] Fix Null Tile Entity Worlds
diff --git a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch b/CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch
similarity index 95%
rename from CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch
rename to CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch
index 07b12bf..26c93a3 100644
--- a/CraftBukkit-Patches/0137-Make-moved-too-quickly-limit-configurable.patch
+++ b/CraftBukkit-Patches/0136-Make-moved-too-quickly-limit-configurable.patch
@@ -1,11 +1,11 @@
-From 1fb16f928836f17ffa517b01c58cd508a1d7f120 Mon Sep 17 00:00:00 2001
+From 73512ac0ebfd34e1366b62c6f01fdc72cd41a2ed Mon Sep 17 00:00:00 2001
 From: Jonas Konrad <me@yawk.at>
 Date: Tue, 22 Jul 2014 15:59:01 +0200
 Subject: [PATCH] Make "moved too quickly" limit configurable
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3fe7038..ccb21ed 100644
+index 54bc1b0..9216dee 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -390,7 +390,8 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
@@ -34,5 +34,5 @@ index 7e774f2..2a23a4e 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 
diff --git a/CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch b/CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch
similarity index 97%
rename from CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch
rename to CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch
index 4aa8d0c..01ed4ca 100644
--- a/CraftBukkit-Patches/0138-Apply-NBTReadLimiter-to-more-things.patch
+++ b/CraftBukkit-Patches/0137-Apply-NBTReadLimiter-to-more-things.patch
@@ -1,4 +1,4 @@
-From d3b40c4783d20d064464ff8d5f963fa807565c1b Mon Sep 17 00:00:00 2001
+From 7f8d4077e958e3f5218b6a7862145e2e3eef9d17 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 27 Jul 2014 20:46:04 +1000
 Subject: [PATCH] Apply NBTReadLimiter to more things.
diff --git a/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch b/CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch
similarity index 98%
rename from CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch
rename to CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch
index 6f0406c..db5503b 100644
--- a/CraftBukkit-Patches/0139-Allow-Attribute-Capping.patch
+++ b/CraftBukkit-Patches/0138-Allow-Attribute-Capping.patch
@@ -1,4 +1,4 @@
-From a61403a4a63d3cb2f3c78afd0089fe457ddeb029 Mon Sep 17 00:00:00 2001
+From 2cff55cc3cbe16d2294702ba3c99d7528f6cff0d Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Mon, 28 Jul 2014 16:55:51 +1000
 Subject: [PATCH] Allow Attribute Capping.
@@ -71,5 +71,5 @@ index 2a23a4e..a187598 100644
 +    }
  }
 -- 
-1.9.0.msysgit.0
+2.1.4
 
diff --git a/CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch b/CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch
similarity index 94%
rename from CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch
rename to CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch
index d6c9f2a..1f68a8f 100644
--- a/CraftBukkit-Patches/0140-Only-fetch-an-online-UUID-in-online-mode.patch
+++ b/CraftBukkit-Patches/0139-Only-fetch-an-online-UUID-in-online-mode.patch
@@ -1,4 +1,4 @@
-From f1e25e4a01135d868f568daa0ac749601ae3b59d Mon Sep 17 00:00:00 2001
+From 1ab114d800f336de3b605b40172b5bc3fcc91c2e Mon Sep 17 00:00:00 2001
 From: Maxim Van de Wynckel <maxim_vdw@hotmail.com>
 Date: Wed, 30 Jul 2014 01:19:51 +0200
 Subject: [PATCH] Only fetch an online UUID in online mode
@@ -12,7 +12,7 @@ You want to store data for player "Test"  who never joined. An online UUID is cr
 The player Test joins with an offline UUID but that will not match the online UUID of the saved data.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9328d8e..59386fd 100644
+index da6c5cb..10fc305 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1295,8 +1295,14 @@ public final class CraftServer implements Server {
diff --git a/CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch b/CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch
similarity index 99%
rename from CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch
rename to CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch
index 59951e8..5fcc342 100644
--- a/CraftBukkit-Patches/0141-Filter-attribute-modifiers-which-cause-the-attribute.patch
+++ b/CraftBukkit-Patches/0140-Filter-attribute-modifiers-which-cause-the-attribute.patch
@@ -1,4 +1,4 @@
-From 9699ad5e050b3efc2af63c2bcd2568d4c300dfaf Mon Sep 17 00:00:00 2001
+From 7af8a95d81cc9659e6482da246054ff8b48d42ab Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Thu, 31 Jul 2014 17:48:20 +0100
 Subject: [PATCH] Filter attribute modifiers which cause the attribute to go
diff --git a/CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch
similarity index 97%
rename from CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch
rename to CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch
index 03dd726..4664310 100644
--- a/CraftBukkit-Patches/0142-Plug-WorldMap-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0141-Plug-WorldMap-Memory-Leak.patch
@@ -1,4 +1,4 @@
-From efbdf11c3b689e1d1197ea71e2157c9d3af7b126 Mon Sep 17 00:00:00 2001
+From 4deba65347bce03f23bd62f6d69f177c7caabb99 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 8 Aug 2014 19:57:03 +1000
 Subject: [PATCH] Plug WorldMap Memory Leak
diff --git a/CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch b/CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch
similarity index 94%
rename from CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch
rename to CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch
index e111ad0..8deca55 100644
--- a/CraftBukkit-Patches/0143-Fix-Corrupted-Trapped-Chest.patch
+++ b/CraftBukkit-Patches/0142-Fix-Corrupted-Trapped-Chest.patch
@@ -1,4 +1,4 @@
-From 6349c3ae7b6e662d7aded972ea4b2c3741e046f8 Mon Sep 17 00:00:00 2001
+From bdd75a89d6001123b5457b1770569f5d5a0e3091 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Aug 2014 00:56:41 -0400
 Subject: [PATCH] Fix Corrupted Trapped Chest
diff --git a/CraftBukkit-Patches/0144-Remove-uneeded-validation.patch b/CraftBukkit-Patches/0143-Remove-uneeded-validation.patch
similarity index 96%
rename from CraftBukkit-Patches/0144-Remove-uneeded-validation.patch
rename to CraftBukkit-Patches/0143-Remove-uneeded-validation.patch
index ca064a9..3afcfbd 100644
--- a/CraftBukkit-Patches/0144-Remove-uneeded-validation.patch
+++ b/CraftBukkit-Patches/0143-Remove-uneeded-validation.patch
@@ -1,4 +1,4 @@
-From 3f34e4ee12532910b03a8285c717349bd5659373 Mon Sep 17 00:00:00 2001
+From 5b9920bf88e687ddfbd902c5e47f1babe2c96ddf Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Fri, 15 Aug 2014 18:11:09 -0400
 Subject: [PATCH] Remove uneeded validation
diff --git a/CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch
similarity index 97%
rename from CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch
rename to CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch
index 87f86bd..9dd4e33 100644
--- a/CraftBukkit-Patches/0145-Add-Hunger-Config-Values.patch
+++ b/CraftBukkit-Patches/0144-Add-Hunger-Config-Values.patch
@@ -1,4 +1,4 @@
-From 4dc82b6c36d8eb7218545353e06563d1892e1e3e Mon Sep 17 00:00:00 2001
+From 6942f56ca7f6970335aebd05da24b5d59e8b67ca Mon Sep 17 00:00:00 2001
 From: lazertester <austin.techhead@gmail.com>
 Date: Sun, 17 Aug 2014 19:56:17 +1000
 Subject: [PATCH] Add Hunger Config Values
diff --git a/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch b/CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch
similarity index 96%
rename from CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch
rename to CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch
index 2e8cbd1..943a7df 100644
--- a/CraftBukkit-Patches/0146-Make-debug-logging-togglable.patch
+++ b/CraftBukkit-Patches/0145-Make-debug-logging-togglable.patch
@@ -1,4 +1,4 @@
-From d1f07a955fb6eb515f8bd117427c3d5e2941677d Mon Sep 17 00:00:00 2001
+From e878de3e7c56bf3fe6d09451e184478f9deb064a Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Sun, 17 Aug 2014 12:42:53 +0200
 Subject: [PATCH] Make debug logging togglable.
@@ -63,5 +63,5 @@ index 08d68aa..f37d1c2 100644
      </Loggers>
  </Configuration>
 -- 
-1.9.0.msysgit.0
+2.1.4
 
diff --git a/CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch b/CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch
similarity index 95%
rename from CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch
rename to CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch
index 7b261b8..611bb69 100644
--- a/CraftBukkit-Patches/0147-Skip-invalid-enchants-in-CraftMetaItem.patch
+++ b/CraftBukkit-Patches/0146-Skip-invalid-enchants-in-CraftMetaItem.patch
@@ -1,4 +1,4 @@
-From 2417ba6cf39bd3a085012e939030e3c6bcceb101 Mon Sep 17 00:00:00 2001
+From 184a03dfc5e9be08e2f8f2ff6f008c0abde7545d Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Tue, 19 Aug 2014 11:04:21 +0100
 Subject: [PATCH] Skip invalid enchants in CraftMetaItem
diff --git a/CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch b/CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch
similarity index 97%
rename from CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch
rename to CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch
index 3b02632..0fd4fa4 100644
--- a/CraftBukkit-Patches/0148-Limit-TNT-Detonations-per-tick.patch
+++ b/CraftBukkit-Patches/0147-Limit-TNT-Detonations-per-tick.patch
@@ -1,4 +1,4 @@
-From 385cf5e40bcc3f07193be94b1f7cbeb0c2f91428 Mon Sep 17 00:00:00 2001
+From 21d950236aa7a988412f30255ca770c0e0bdb742 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Aug 2014 18:12:32 -0400
 Subject: [PATCH] Limit TNT Detonations per tick
diff --git a/CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch b/CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
similarity index 98%
rename from CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
rename to CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
index 0b2f19f..7a550e0 100644
--- a/CraftBukkit-Patches/0149-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
+++ b/CraftBukkit-Patches/0148-Added-isUnbreakable-and-setUnbreakable-to-ItemMeta.patch
@@ -1,4 +1,4 @@
-From 991e55cb31f9b37642033e6b8f0bab2a851344f6 Mon Sep 17 00:00:00 2001
+From d521aa9ddf7e565fbb704310d408470c7c0e74b2 Mon Sep 17 00:00:00 2001
 From: libraryaddict <redwarfare@live.com>
 Date: Fri, 22 Aug 2014 05:35:16 -0400
 Subject: [PATCH] Added isUnbreakable and setUnbreakable to ItemMeta
diff --git a/CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch b/CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch
similarity index 95%
rename from CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch
rename to CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch
index c2d6bad..1461348 100644
--- a/CraftBukkit-Patches/0150-Configurable-Hanging-Tick.patch
+++ b/CraftBukkit-Patches/0149-Configurable-Hanging-Tick.patch
@@ -1,4 +1,4 @@
-From cccdb674a7695fa878fe5bb66f5f5d1f1816735b Mon Sep 17 00:00:00 2001
+From 280c0f420ece8dd300b54be1e37cde5aae71cf37 Mon Sep 17 00:00:00 2001
 From: drXor <mcyoung@mit.edu>
 Date: Sat, 9 Aug 2014 13:56:51 -0400
 Subject: [PATCH] Configurable Hanging Tick
diff --git a/CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch b/CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch
similarity index 95%
rename from CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch
rename to CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch
index 129262c..d363107 100644
--- a/CraftBukkit-Patches/0151-Refactor-ItemDoor-Place.patch
+++ b/CraftBukkit-Patches/0150-Refactor-ItemDoor-Place.patch
@@ -1,4 +1,4 @@
-From becc7744e642d615743a11637894f462cae2a8b3 Mon Sep 17 00:00:00 2001
+From 9edf518658c3d715c769f4d9c06dd048cb34dd54 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Tue, 30 Sep 2014 21:43:15 +1000
 Subject: [PATCH] Refactor ItemDoor Place
diff --git a/CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch
similarity index 97%
rename from CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch
rename to CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch
index 08d6df9..7e3ac07 100644
--- a/CraftBukkit-Patches/0152-BungeeCord-Chat-API.patch
+++ b/CraftBukkit-Patches/0151-BungeeCord-Chat-API.patch
@@ -1,4 +1,4 @@
-From 88328b7b3d3969c871aaa8b75e22d81ce5e1dc07 Mon Sep 17 00:00:00 2001
+From 3dbfff07a5322402f177060407459795ef407a96 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 13:06:05 +1100
 Subject: [PATCH] BungeeCord Chat API
@@ -56,7 +56,7 @@ index 0000000..6cd5df2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59386fd..6174417 100644
+index 10fc305..15aa1b7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -121,6 +121,7 @@ import io.netty.buffer.ByteBufOutputStream;
diff --git a/CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch
similarity index 98%
rename from CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch
rename to CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch
index eae8b30..e4d2e57 100644
--- a/CraftBukkit-Patches/0153-Use-Standard-List-for-EntitySlices.patch
+++ b/CraftBukkit-Patches/0152-Use-Standard-List-for-EntitySlices.patch
@@ -1,4 +1,4 @@
-From 89545c6308f2c4f78ba8e76d528d25518129dc6a Mon Sep 17 00:00:00 2001
+From a55527d1828bade2cc9a2bb5a9a44a8e19e89c64 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:33:36 +1100
 Subject: [PATCH] Use Standard List for EntitySlices.
diff --git a/CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch b/CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch
similarity index 98%
rename from CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch
rename to CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch
index 033dcdd..a705237 100644
--- a/CraftBukkit-Patches/0154-Allow-Capping-Tile-Entity-Tick-Time.patch
+++ b/CraftBukkit-Patches/0153-Allow-Capping-Tile-Entity-Tick-Time.patch
@@ -1,4 +1,4 @@
-From 88ab65907d69d2dd6276fe73e9a5ead94e2cd758 Mon Sep 17 00:00:00 2001
+From 7a8d0e4b3fa6422a8751bdc043d58394913d9252 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Fri, 20 Feb 2015 21:39:31 +1100
 Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
diff --git a/CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch b/CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch
similarity index 97%
rename from CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch
rename to CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch
index 13f46b4..cd1ae6b 100644
--- a/CraftBukkit-Patches/0155-Use-FastMatches-for-ItemStack-Dirty-Check.patch
+++ b/CraftBukkit-Patches/0154-Use-FastMatches-for-ItemStack-Dirty-Check.patch
@@ -1,4 +1,4 @@
-From e5788893cca9684a0ae5a54bc56567c3a2d8b85f Mon Sep 17 00:00:00 2001
+From e851ebeb7b4479287bbaf003c4f2cdb51faa5119 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 22 Feb 2015 12:27:40 +1100
 Subject: [PATCH] Use FastMatches for ItemStack Dirty Check
diff --git a/CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch b/CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch
similarity index 97%
rename from CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch
rename to CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch
index 0fcbccc..578d6e0 100644
--- a/CraftBukkit-Patches/0156-Use-CLQ-for-main-thread-tasks.patch
+++ b/CraftBukkit-Patches/0155-Use-CLQ-for-main-thread-tasks.patch
@@ -1,4 +1,4 @@
-From 1f925e84e012fe5971f7811c32c597bc0f8f96fa Mon Sep 17 00:00:00 2001
+From 2dd7fa6e3be9ded06d72c90a0426ef938f7688c3 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sun, 19 Apr 2015 09:19:39 +1000
 Subject: [PATCH] Use CLQ for main thread tasks.