some renaming for consistency, forge update
Merge branch 'master' of https://github.com/eXiGe/moreblocks