#1230 Conduit overlap
Fix non-major axis offsets not working properly
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git