diff --git a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java
index 08e949e1..5203e15f 100644
--- a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java
+++ b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java
@@ -2,8 +2,8 @@ package com.massivecraft.mcore.adapter;
 
 import java.lang.reflect.Type;
 
-import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventoryPlayer;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
diff --git a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java b/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java
index 66a554fb..f2ac923c 100644
--- a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java
+++ b/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java
@@ -2,9 +2,9 @@ package com.massivecraft.mcore.inventory;
 
 import org.bukkit.inventory.InventoryHolder;
 
-import net.minecraft.server.v1_5_R2.EntityHuman;
-import net.minecraft.server.v1_5_R2.ItemStack;
-import net.minecraft.server.v1_5_R2.PlayerInventory;
+import net.minecraft.server.v1_5_R3.EntityHuman;
+import net.minecraft.server.v1_5_R3.ItemStack;
+import net.minecraft.server.v1_5_R3.PlayerInventory;
 
 /**
  * This is an extended version of the NMS.PlayerInventory.
@@ -27,7 +27,6 @@ import net.minecraft.server.v1_5_R2.PlayerInventory;
  * m() (2 matches)
  * pickup(ItemStack) (2 matches)
  * PlayerInventory(EntityHuman)
- * 
  */
 public class MCorePlayerInventory extends PlayerInventory
 {
diff --git a/src/com/massivecraft/mcore/util/BiomeUtil.java b/src/com/massivecraft/mcore/util/BiomeUtil.java
index ef305620..23526879 100644
--- a/src/com/massivecraft/mcore/util/BiomeUtil.java
+++ b/src/com/massivecraft/mcore/util/BiomeUtil.java
@@ -5,12 +5,12 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.AbstractMap.SimpleEntry;
 
-import net.minecraft.server.v1_5_R2.BiomeBase;
-import net.minecraft.server.v1_5_R2.Chunk;
-import net.minecraft.server.v1_5_R2.WorldServer;
+import net.minecraft.server.v1_5_R3.BiomeBase;
+import net.minecraft.server.v1_5_R3.Chunk;
+import net.minecraft.server.v1_5_R3.WorldServer;
 
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
 
 public class BiomeUtil
 {
diff --git a/src/com/massivecraft/mcore/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java
index 6c26452c..b479f7cc 100644
--- a/src/com/massivecraft/mcore/util/BukkitCommandUtil.java
+++ b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java
@@ -6,7 +6,7 @@ import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.SimpleCommandMap;
-import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
 
 public class BukkitCommandUtil
 {
diff --git a/src/com/massivecraft/mcore/util/InventoryUtil.java b/src/com/massivecraft/mcore/util/InventoryUtil.java
index 90f4bc76..933026ef 100644
--- a/src/com/massivecraft/mcore/util/InventoryUtil.java
+++ b/src/com/massivecraft/mcore/util/InventoryUtil.java
@@ -3,8 +3,8 @@ package com.massivecraft.mcore.util;
 import java.util.HashMap;
 
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_5_R2.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_5_R3.inventory.CraftInventoryPlayer;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.inventory.InventoryType.SlotType;
diff --git a/src/com/massivecraft/mcore/util/LightUtil.java b/src/com/massivecraft/mcore/util/LightUtil.java
index a34f0773..b9221ab3 100644
--- a/src/com/massivecraft/mcore/util/LightUtil.java
+++ b/src/com/massivecraft/mcore/util/LightUtil.java
@@ -1,10 +1,10 @@
 package com.massivecraft.mcore.util;
 
-import net.minecraft.server.v1_5_R2.WorldServer;
+import net.minecraft.server.v1_5_R3.WorldServer;
 
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_5_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_5_R3.CraftWorld;
 
 /**
  * Find the method by going through CraftBlock.setTypeId()
diff --git a/src/com/massivecraft/mcore/util/MUtil.java b/src/com/massivecraft/mcore/util/MUtil.java
index 15ba6dd9..6239c99f 100644
--- a/src/com/massivecraft/mcore/util/MUtil.java
+++ b/src/com/massivecraft/mcore/util/MUtil.java
@@ -19,7 +19,7 @@ import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import net.minecraft.server.v1_5_R2.DedicatedServer;
+import net.minecraft.server.v1_5_R3.DedicatedServer;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -27,7 +27,7 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
diff --git a/src/com/massivecraft/mcore/util/PlayerUtil.java b/src/com/massivecraft/mcore/util/PlayerUtil.java
index e88901a5..5071b08f 100644
--- a/src/com/massivecraft/mcore/util/PlayerUtil.java
+++ b/src/com/massivecraft/mcore/util/PlayerUtil.java
@@ -8,11 +8,11 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ConcurrentSkipListSet;
 
-import net.minecraft.server.v1_5_R2.EntityPlayer;
-import net.minecraft.server.v1_5_R2.Packet8UpdateHealth;
+import net.minecraft.server.v1_5_R3.EntityPlayer;
+import net.minecraft.server.v1_5_R3.Packet8UpdateHealth;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_5_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_5_R3.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
diff --git a/src/com/massivecraft/mcore/util/SenderUtil.java b/src/com/massivecraft/mcore/util/SenderUtil.java
index 9a520439..4522a7b0 100644
--- a/src/com/massivecraft/mcore/util/SenderUtil.java
+++ b/src/com/massivecraft/mcore/util/SenderUtil.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import net.minecraft.server.v1_5_R2.MinecraftServer;
+import net.minecraft.server.v1_5_R3.MinecraftServer;
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -17,7 +17,7 @@ import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.command.RemoteConsoleCommandSender;
-import org.bukkit.craftbukkit.v1_5_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_5_R3.CraftServer;
 import org.bukkit.entity.Player;
 
 import com.massivecraft.mcore.MCore;
diff --git a/src/com/massivecraft/mcore/util/TextWrapper.java b/src/com/massivecraft/mcore/util/TextWrapper.java
index 73e1fda7..0866a3e9 100644
--- a/src/com/massivecraft/mcore/util/TextWrapper.java
+++ b/src/com/massivecraft/mcore/util/TextWrapper.java
@@ -25,7 +25,7 @@ public class TextWrapper
 	private static final char COLOR_CHAR = '\u00A7';
 	private static final int CHAT_WINDOW_WIDTH = 320;
 	private static final int CHAT_STRING_LENGTH = 119;
-	private static final String allowedChars = net.minecraft.server.v1_5_R2.SharedConstants.allowedCharacters;
+	private static final String allowedChars = net.minecraft.server.v1_5_R3.SharedConstants.allowedCharacters;
 	
 	public static int getCharPixelWidth(char ch)
 	{