Updated to 1.7-Spigot-hack