Fix merge conflicts

This commit is contained in:
mDiyo committed 2013-09-08 20:37:41 -07:00
commit 856b31361d
199 files changed
+947 -322

No files matched your search

+1 -1
View File
@@ -67,7 +67,7 @@ public class XinStick extends Item
public static void healPlayer (EntityPlayer player)
{
player.setEntityHealth(50);
player.setHealth(50);
}
public static void spawnItem (double x, double y, double z, ItemStack stack, World world)