Merge pull request #141 from way2muchnoise/1.7-update

no more crafting water to iron