Added 1.7's blocks and items

Signed-off-by: Matt Low <matt-low@darqy.net>
Merge pull request #485 from Darqy/master

Added 1.7's blocks and items.