Added API for EnderAttuned
Update robot.names
Merge pull request #554 from JoshTheEnder/patch-1

Update robot.names
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Revert "Non-debug libs."

This reverts commit 32cd6fa61e832fc99f3fa893163422286a18f9b9.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
Revert "Non-debug libs."

This reverts commit 32cd6fa61e832fc99f3fa893163422286a18f9b9.

Conflicts:
	build.properties
Merge branch 'master' of github.com:MightyPirates/OpenComputers
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	build.properties
Added hologram projection offset
Merge branch 'master' of https://github.com/ingie/OpenComputers
Renamed 'offset' to 'translation' to mirror general 3d/ogl terminology.
Added x/z translation for hologram.
Added setting for max translation based on tier.
Made max translation a relative value based on the actual hologram's size (1 = 1x hologram size).
Fixed GUIs being very dark / black sometimes.
Closes #546.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
Tweaked and cleaned up slot highlighting a bit, also made it available in robot GUI.
Returning number of crafted items from crafting upgrade's `craft()` as second result (this is the stack size of the result). Closes #561.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
Fixed a massive game-breaking bug of epic proportions [/sarcasm].
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
Fixed a potential error in io lib when no screen was attached.
Made sign and nav upgrades work in tablets.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/common/item/Tablet.scala