Missed one.
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Added config entry to allow ignoring power from specific supported power mods, closes #458.
Cleaned up event listener registration a little, moving it all to init... can't remember why this was all over the place. Maybe this will break stuff.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
Fixed audio tick handler never being registered.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala