Fixed a derp in the fix for the broken fix for the thing.
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/Environment.scala
Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10