first attempt at overriding AI, for #1877
Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x

Conflicts:
	common/buildcraft/core/ItemMapLocation.java