Update robot.names
Update zh_CN.lang
Merge pull request #516 from ViKaleidoscope/patch-1

Update zh_CN.lang
Made cables dyeable and made them not connect when of different colors (except for light gray, the default color, which connects to all other colors). Closes #517.
Merge branch 'master' of github.com:MightyPirates/OpenComputers
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/multipart/MultiPart.scala
Merge branch 'patch-1' of https://github.com/jecowa/OpenComputers
Changed robot name file parsing to allow inline # to mark rest of the line as comment (<3 Scala) and cleaned up the robot name file.
Added a few Doctor Who robot names
Specifically:
- Dalek Sec
- K-9
Made holograms rotatable (only along the Y axis for now) by whacking them with a wrench.
Avoiding potential race condition in tablets. I think.
Avoiding (harmless) IC2 log spam on world unload.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala
Switched to extracting the native library into the game directory (instead of the temp directory), configurable.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
Merge pull request #519 from logangorence/master

Added a few Doctor Who robot names
Made cables render a little socket / plug when connected to blocks and some other stuff.
Fffff.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/font/StaticFontRenderer.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10