Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.properties
	src/main/java/emt/item/armor/wings/ItemFeatherWing.java
This commit is contained in:
Dream-Master committed 2016-10-30 17:36:04 +01:00
commit d18f9730a8
1 file changed
-3
@@ -118,8 +118,5 @@ public class ItemFeatherWing extends ItemArmor {
if (player.isSneaking() && !player.onGround && player.motionY < 0) {
player.motionY *= 0.6;
}
if (player.fallDistance > 0.0F) {
player.fallDistance-= player.fallDistance/40;
}
}
}