#394 Ender energy conduits limited to 500 MJ/t per input.
Merge branch 'master' into 1.6.4