diff --git a/src/com/massivecraft/mcore/adapter/InventoryAdapter.java b/src/com/massivecraft/mcore/adapter/InventoryAdapter.java
index d30a2e10..305c2d4f 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_6_R2.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_6_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/adapter/ItemStackAdapter.java b/src/com/massivecraft/mcore/adapter/ItemStackAdapter.java
index 234af73e..75501585 100644
--- a/src/com/massivecraft/mcore/adapter/ItemStackAdapter.java
+++ b/src/com/massivecraft/mcore/adapter/ItemStackAdapter.java
@@ -43,6 +43,7 @@ import com.massivecraft.mcore.xlib.gson.JsonSerializer;
  * way. This serializer requires manual updating to work but produces clean
  * json. See the file itemstackformat.txt for more info.
  */
+@SuppressWarnings("deprecation")
 public class ItemStackAdapter implements JsonDeserializer<ItemStack>, JsonSerializer<ItemStack>
 {
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java b/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java
index b263a964..b4c9e32d 100644
--- a/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java
+++ b/src/com/massivecraft/mcore/adapter/PotionEffectAdapter.java
@@ -6,6 +6,7 @@ import org.bukkit.potion.PotionEffectType;
 import com.massivecraft.mcore.xlib.gson.JsonElement;
 import com.massivecraft.mcore.xlib.gson.JsonObject;
 
+@SuppressWarnings("deprecation")
 public class PotionEffectAdapter
 {
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java b/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java
index 4cf352b0..0add0672 100644
--- a/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java
+++ b/src/com/massivecraft/mcore/inventory/MCorePlayerInventory.java
@@ -1,8 +1,8 @@
 package com.massivecraft.mcore.inventory;
 
-import net.minecraft.server.v1_6_R2.EntityHuman;
-import net.minecraft.server.v1_6_R2.ItemStack;
-import net.minecraft.server.v1_6_R2.PlayerInventory;
+import net.minecraft.server.v1_6_R3.EntityHuman;
+import net.minecraft.server.v1_6_R3.ItemStack;
+import net.minecraft.server.v1_6_R3.PlayerInventory;
 
 import org.bukkit.inventory.InventoryHolder;
 
@@ -28,7 +28,7 @@ import org.bukkit.inventory.InventoryHolder;
  * pickup(ItemStack) (2 matches)
  * PlayerInventory(EntityHuman)
  * 
- * As of 1.6.1 and 1.6.2 these are the references:
+ * As of 1.6.1 and 1.6.2 and 1.6.4 these are the references:
  * 
  * a(EntityHuman) (2 matches)
  * a(float)
@@ -38,6 +38,7 @@ import org.bukkit.inventory.InventoryHolder;
  * 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 58b94e37..1bd1be9f 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_6_R2.BiomeBase;
-import net.minecraft.server.v1_6_R2.Chunk;
-import net.minecraft.server.v1_6_R2.WorldServer;
+import net.minecraft.server.v1_6_R3.BiomeBase;
+import net.minecraft.server.v1_6_R3.Chunk;
+import net.minecraft.server.v1_6_R3.WorldServer;
 
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_R3.CraftWorld;
 
 public class BiomeUtil
 {
diff --git a/src/com/massivecraft/mcore/util/BukkitCommandUtil.java b/src/com/massivecraft/mcore/util/BukkitCommandUtil.java
index 8ed9a3af..b8784194 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_6_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
 
 public class BukkitCommandUtil
 {
diff --git a/src/com/massivecraft/mcore/util/InventoryUtil.java b/src/com/massivecraft/mcore/util/InventoryUtil.java
index bc19a44f..1c5f45e5 100644
--- a/src/com/massivecraft/mcore/util/InventoryUtil.java
+++ b/src/com/massivecraft/mcore/util/InventoryUtil.java
@@ -4,8 +4,8 @@ import java.util.HashMap;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryCustom;
-import org.bukkit.craftbukkit.v1_6_R2.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventoryCustom;
+import org.bukkit.craftbukkit.v1_6_R3.inventory.CraftInventoryPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryType;
@@ -185,7 +185,7 @@ public class InventoryUtil
 	{
 		if (itemStack == null) return true;
 		if (itemStack.getAmount() == 0) return true;
-		if (itemStack.getTypeId() == 0) return true;
+		if (itemStack.getType() == Material.AIR) return true;
 		return false;
 	}
 	
diff --git a/src/com/massivecraft/mcore/util/LightUtil.java b/src/com/massivecraft/mcore/util/LightUtil.java
index c98a4950..ec6c3757 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_6_R2.WorldServer;
+import net.minecraft.server.v1_6_R3.WorldServer;
 
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_6_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_6_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 752048e3..6efe917c 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_6_R2.DedicatedServer;
+import net.minecraft.server.v1_6_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_6_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -327,6 +327,7 @@ public class MUtil
 		return getPotionEffectBits(item) == 0;
 	}
 	
+	@SuppressWarnings("deprecation")
 	public static List<PotionEffect> getPotionEffects(ItemStack itemStack)
 	{
 		if (itemStack == null) return null;
diff --git a/src/com/massivecraft/mcore/util/PlayerUtil.java b/src/com/massivecraft/mcore/util/PlayerUtil.java
index 2e8905d4..a08e7438 100644
--- a/src/com/massivecraft/mcore/util/PlayerUtil.java
+++ b/src/com/massivecraft/mcore/util/PlayerUtil.java
@@ -5,11 +5,11 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListSet;
 
-import net.minecraft.server.v1_6_R2.EntityPlayer;
-import net.minecraft.server.v1_6_R2.Packet8UpdateHealth;
+import net.minecraft.server.v1_6_R3.EntityPlayer;
+import net.minecraft.server.v1_6_R3.Packet8UpdateHealth;
 
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_6_R2.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_6_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 3359e2b8..47892244 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_6_R2.MinecraftServer;
+import net.minecraft.server.v1_6_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_6_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_6_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 aa4b16e7..9aac1fb4 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_6_R2.SharedConstants.allowedCharacters;
+	private static final String allowedChars = net.minecraft.server.v1_6_R3.SharedConstants.allowedCharacters;
 	
 	public static int getCharPixelWidth(char ch)
 	{
diff --git a/src/com/massivecraft/mcore/util/Txt.java b/src/com/massivecraft/mcore/util/Txt.java
index 7e8135c5..98f31e13 100644
--- a/src/com/massivecraft/mcore/util/Txt.java
+++ b/src/com/massivecraft/mcore/util/Txt.java
@@ -389,11 +389,6 @@ public class Txt
 		return getNicedEnum(material);
 	}
 	
-	public static String getMaterialName(int materialId)
-	{
-		return getMaterialName(Material.getMaterial(materialId));
-	}
-	
 	// -------------------------------------------- //
 	// Paging and chrome-tools like titleize
 	// -------------------------------------------- //