Make addRequirement properly combine stacks, simplify checkCrafting, fixes #535