Fixed dispenser and damage from items along with some minor bugs on barrel and WoodenCupItem.java
Merge branch 'master' of https://github.com/jannickj/minecraftmod