diff --git a/CraftBukkit-Patches/0042-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch b/CraftBukkit-Patches/0042-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch
deleted file mode 100644
index d40fc888b5..0000000000
--- a/CraftBukkit-Patches/0042-ANSI-color-codes-now-reset-text-attributes.-Fixes-BU.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From a2a29eb62901c4375eb1809df2fd166e6ac12492 Mon Sep 17 00:00:00 2001
-From: James Clarke <jamesrtclarke@me.com>
-Date: Sat, 26 Jan 2013 10:39:45 +0000
-Subject: [PATCH] ANSI color codes now reset text attributes. Fixes BUKKIT-3508
-
-The client resets all formatting after a color code is received, but currently the ANSI codes do not, and so the console does not accurately reflect the appearance of the formatted text. Instead, the ANSI color codes are now set to reset all text attributes.
----
- .../net/minecraft/server/ConsoleLogFormatter.java  |  2 +-
- .../craftbukkit/command/ColouredConsoleSender.java | 34 +++++++++++-----------
- 2 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/src/main/java/net/minecraft/server/ConsoleLogFormatter.java b/src/main/java/net/minecraft/server/ConsoleLogFormatter.java
-index 60d26d5..86bb210 100644
---- a/src/main/java/net/minecraft/server/ConsoleLogFormatter.java
-+++ b/src/main/java/net/minecraft/server/ConsoleLogFormatter.java
-@@ -15,7 +15,7 @@ class ConsoleLogFormatter extends Formatter {
- 
-     final ConsoleLogManager a;
-     // CraftBukkit start - add color stripping
--    private Pattern pattern = Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]");
-+    private Pattern pattern = Pattern.compile("\\x1B\\[([0-9]{1,2}(;[0-9]{1,2})*)?[m|K]");
-     private boolean strip = false;
-     // CraftBukkit end
- 
-diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
-index c86253c..3ab8f3b 100644
---- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
-+++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
-@@ -22,28 +22,28 @@ public class ColouredConsoleSender extends CraftConsoleCommandSender {
-         this.reader = ((CraftServer) getServer()).getReader();
-         this.terminal = reader.getTerminal();
- 
--        replacements.put(ChatColor.BLACK, Ansi.ansi().fg(Ansi.Color.BLACK).boldOff().toString());
--        replacements.put(ChatColor.DARK_BLUE, Ansi.ansi().fg(Ansi.Color.BLUE).boldOff().toString());
--        replacements.put(ChatColor.DARK_GREEN, Ansi.ansi().fg(Ansi.Color.GREEN).boldOff().toString());
--        replacements.put(ChatColor.DARK_AQUA, Ansi.ansi().fg(Ansi.Color.CYAN).boldOff().toString());
--        replacements.put(ChatColor.DARK_RED, Ansi.ansi().fg(Ansi.Color.RED).boldOff().toString());
--        replacements.put(ChatColor.DARK_PURPLE, Ansi.ansi().fg(Ansi.Color.MAGENTA).boldOff().toString());
--        replacements.put(ChatColor.GOLD, Ansi.ansi().fg(Ansi.Color.YELLOW).boldOff().toString());
--        replacements.put(ChatColor.GRAY, Ansi.ansi().fg(Ansi.Color.WHITE).boldOff().toString());
--        replacements.put(ChatColor.DARK_GRAY, Ansi.ansi().fg(Ansi.Color.BLACK).bold().toString());
--        replacements.put(ChatColor.BLUE, Ansi.ansi().fg(Ansi.Color.BLUE).bold().toString());
--        replacements.put(ChatColor.GREEN, Ansi.ansi().fg(Ansi.Color.GREEN).bold().toString());
--        replacements.put(ChatColor.AQUA, Ansi.ansi().fg(Ansi.Color.CYAN).bold().toString());
--        replacements.put(ChatColor.RED, Ansi.ansi().fg(Ansi.Color.RED).bold().toString());
--        replacements.put(ChatColor.LIGHT_PURPLE, Ansi.ansi().fg(Ansi.Color.MAGENTA).bold().toString());
--        replacements.put(ChatColor.YELLOW, Ansi.ansi().fg(Ansi.Color.YELLOW).bold().toString());
--        replacements.put(ChatColor.WHITE, Ansi.ansi().fg(Ansi.Color.WHITE).bold().toString());
-+        replacements.put(ChatColor.BLACK, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLACK).boldOff().toString());
-+        replacements.put(ChatColor.DARK_BLUE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).boldOff().toString());
-+        replacements.put(ChatColor.DARK_GREEN, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.GREEN).boldOff().toString());
-+        replacements.put(ChatColor.DARK_AQUA, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.CYAN).boldOff().toString());
-+        replacements.put(ChatColor.DARK_RED, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.RED).boldOff().toString());
-+        replacements.put(ChatColor.DARK_PURPLE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.MAGENTA).boldOff().toString());
-+        replacements.put(ChatColor.GOLD, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.YELLOW).boldOff().toString());
-+        replacements.put(ChatColor.GRAY, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.WHITE).boldOff().toString());
-+        replacements.put(ChatColor.DARK_GRAY, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLACK).bold().toString());
-+        replacements.put(ChatColor.BLUE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.BLUE).bold().toString());
-+        replacements.put(ChatColor.GREEN, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.GREEN).bold().toString());
-+        replacements.put(ChatColor.AQUA, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.CYAN).bold().toString());
-+        replacements.put(ChatColor.RED, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.RED).bold().toString());
-+        replacements.put(ChatColor.LIGHT_PURPLE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.MAGENTA).bold().toString());
-+        replacements.put(ChatColor.YELLOW, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.YELLOW).bold().toString());
-+        replacements.put(ChatColor.WHITE, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.WHITE).bold().toString());
-         replacements.put(ChatColor.MAGIC, Ansi.ansi().a(Attribute.BLINK_SLOW).toString());
-         replacements.put(ChatColor.BOLD, Ansi.ansi().a(Attribute.UNDERLINE_DOUBLE).toString());
-         replacements.put(ChatColor.STRIKETHROUGH, Ansi.ansi().a(Attribute.STRIKETHROUGH_ON).toString());
-         replacements.put(ChatColor.UNDERLINE, Ansi.ansi().a(Attribute.UNDERLINE).toString());
-         replacements.put(ChatColor.ITALIC, Ansi.ansi().a(Attribute.ITALIC).toString());
--        replacements.put(ChatColor.RESET, Ansi.ansi().a(Attribute.RESET).fg(Ansi.Color.DEFAULT).toString());
-+        replacements.put(ChatColor.RESET, Ansi.ansi().a(Attribute.RESET).toString());
-     }
- 
-     @Override
--- 
-1.8.1-rc2
-
diff --git a/CraftBukkit-Patches/0043-BungeeCord-Support.patch b/CraftBukkit-Patches/0042-BungeeCord-Support.patch
similarity index 97%
rename from CraftBukkit-Patches/0043-BungeeCord-Support.patch
rename to CraftBukkit-Patches/0042-BungeeCord-Support.patch
index d56eefcd01..ea33e6ff52 100644
--- a/CraftBukkit-Patches/0043-BungeeCord-Support.patch
+++ b/CraftBukkit-Patches/0042-BungeeCord-Support.patch
@@ -1,4 +1,4 @@
-From 74da2dee0b9a60a7ec7915ac87b50404d303723f Mon Sep 17 00:00:00 2001
+From 2e0bd90323900b7b0e85d8b8fdefac11564a6aa7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 11:15:11 +1100
 Subject: [PATCH] BungeeCord Support
diff --git a/CraftBukkit-Patches/0044-Texture-Pack-Resolutions.patch b/CraftBukkit-Patches/0043-Texture-Pack-Resolutions.patch
similarity index 98%
rename from CraftBukkit-Patches/0044-Texture-Pack-Resolutions.patch
rename to CraftBukkit-Patches/0043-Texture-Pack-Resolutions.patch
index 0c71a7fb8c..e1dd3b5ec8 100644
--- a/CraftBukkit-Patches/0044-Texture-Pack-Resolutions.patch
+++ b/CraftBukkit-Patches/0043-Texture-Pack-Resolutions.patch
@@ -1,4 +1,4 @@
-From 20fc3a807f658834275d520751f0d5c6a8ec1e28 Mon Sep 17 00:00:00 2001
+From d8572c7da59ef43d0adf53e4dff7400b00bb9e12 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 13:04:45 +1100
 Subject: [PATCH] Texture Pack Resolutions
diff --git a/CraftBukkit-Patches/0045-Entity-Tracking-Intervals.patch b/CraftBukkit-Patches/0044-Entity-Tracking-Intervals.patch
similarity index 94%
rename from CraftBukkit-Patches/0045-Entity-Tracking-Intervals.patch
rename to CraftBukkit-Patches/0044-Entity-Tracking-Intervals.patch
index 3f3618a589..8ce76a9d4b 100644
--- a/CraftBukkit-Patches/0045-Entity-Tracking-Intervals.patch
+++ b/CraftBukkit-Patches/0044-Entity-Tracking-Intervals.patch
@@ -1,4 +1,4 @@
-From 14f1188ae264d2469e5e0743eaa94dd319fa8381 Mon Sep 17 00:00:00 2001
+From 09b15af1239b1792fcafdc409d5d7bda39adeb74 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 13:31:23 +1100
 Subject: [PATCH] Entity Tracking Intervals