Do stuff.

Signed-off-by: netchip <w00tc0d3@outlook.com>
Merge branch 'master' of github.com:TeamBRM/BuildCraftResourceManagement

Conflicts:
	src/main/java/net/brm/tileentities/RegisterTileEntities.java