Fix item durability.
Fixes #1181
Merge branch 'master' into Inventory2

Conflicts:
	src/BlockInfo.cpp
Rename function.
Derp.
Merge pull request #1236 from Howaner/Inventory2

Fix item durability.