Update to Minecraft 1.6.1 - Phase 1

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0034-Thread-Naming-and-Tweaks.patch

@@ -1,4 +1,4 @@
-From 3ffe256945a7df36f9b9fe08be2b44547d8e9c14 Mon Sep 17 00:00:00 2001
+From d94b6e73ee42e11ee17ac1790d326da128236375 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
@@ -6,13 +6,13 @@ Subject: [PATCH] Thread Naming and Tweaks
 Removes the sleep forever thread and adds useful names for debugging to all staged thread files.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index b2a4229..2a6250d 100644
+index ec3d104..ccbd6bc 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -34,7 +34,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          super(options);
          // CraftBukkit end
-         this.l = new ConsoleLogManager("Minecraft-Server", (String) null, (String) null); // CraftBukkit - null last argument
+         this.m = new ConsoleLogManager("Minecraft-Server", (String) null, (String) null); // CraftBukkit - null last argument
 -        new ThreadSleepForever(this);
 +        // new ThreadSleepForever(this);
      }
@@ -31,7 +31,7 @@ index 489e184..bfd219c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
-index a4eae65..496cfe4 100644
+index f5032be..5e45cae 100644
 --- a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
 +++ b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
 @@ -21,6 +21,7 @@ class ThreadLoginVerifier extends Thread {