Added quantity support, and fixed bug with warping to worlds with different inventories.
Merge remote-tracking branch 'origin/master'