Fix missing support for ForestryBlock
Minor stuff
We might be able to reduce some of the world breakage...particually of items (save the bees!)
Should probably fix this...
Merge branch 'master' of https://github.com/ForestryMC/ForestryMC into master-origin

Conflicts:
	api