Oh Relocators, you are so close to being finished!
Merge branch 'origin/master'

Conflicts:
	src/main/java/com/dynious/refinedrelocation/block/ModBlocks.java
	src/main/java/com/dynious/refinedrelocation/item/ItemRelocatorModule.java
	src/main/java/com/dynious/refinedrelocation/item/ModItems.java
	src/main/java/com/dynious/refinedrelocation/mods/FMPHelper.java
	src/main/java/com/dynious/refinedrelocation/proxy/ClientProxy.java
	src/main/java/com/dynious/refinedrelocation/renderer/RendererRelocator.java