rebase
Merge branch 'master' of
https://github.com/beilber/YogscastCompletePack-patch.git

Conflicts:
	config/InvTweaks.cfg
	config/Soul Shards Reborn/Entity Blacklist.cfg
	config/forestry/pipes.conf