Don't register our own blocks, ...

...let FML do that.
Add Item registration
Merge remote-tracking branch 'remotes/upstream/master'