mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +00:00
Fix merge conflicts
This commit is contained in:
commit
856b31361d
199 files changed
+947
-322
No files matched your search
+1
-1
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user