manual merge of master branch changes up to commit 1387bc6

This commit is contained in:
Progwml6 committed 2013-11-23 09:31:19 -05:00
1 parent 2d99d5dba2
commit 14d357ccf6
23 files changed
+317 -172

No files matched your search

@@ -53,7 +53,7 @@ public class SlimeGel extends TConstructBlock
entity.motionY *= -1.2F;
if (entity instanceof EntityLivingBase)
{
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 4));
((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.jump.id, 1, 2));
}
}
entity.fallDistance = 0;