Added 1.7's blocks and items

Also made some tweaks to other items, namely changed "log" and "wood" used by themselves, Oak isn't so much the "default" wood any more. Removed the old Red Rose entry because it's gone in 1.7, replaced with poppy.

Thanks!