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

Conflicts:
	src/main/scala/li/cil/oc/server/component/UpgradeNavigation.scala

src/main/resources/assets/opencomputers/doc/en_US/item/navigationUpgrade.md

@@ -4,4 +4,6 @@
 
 The navigation upgrade provides location and orientation information to devices it is installed in. The coordinates the upgrade provides are relative to the center of the map that was used to craft the upgrade, and the functional range is based on the size of that map.
 
-The map inside a Navigation upgrade can be changed by re-crafting the upgrade with a new map. The old map will be returned to the player. 
+The map inside a Navigation upgrade can be changed by re-crafting the upgrade with a new map. The old map will be returned to the player.
+
+Note that this upgrade is a lot more useful when used in combination with one or more [waypoints](../block/waypoint.md).

src/main/scala/li/cil/oc/client/gui/Waypoint.scala

@@ -60,6 +60,7 @@ class Waypoint(val waypoint: tileentity.Waypoint) extends GuiScreen {
         if (label != waypoint.label) {
           waypoint.label = label
           PacketSender.sendWaypointLabel(waypoint)
+          mc.thePlayer.closeScreen()
         }
       }
       else super.keyTyped(char, code)

src/main/scala/li/cil/oc/server/machine/luac/NativeLuaArchitecture.scala

@@ -303,7 +303,7 @@ class NativeLuaArchitecture(val machine: api.machine.Machine) extends Architectu
 
     apis.foreach(_.initialize())
 
-    lua.load(classOf[Machine].getResourceAsStream(Settings.scriptPath + "machine.lua"), "=kernel", "t")
+    lua.load(classOf[Machine].getResourceAsStream(Settings.scriptPath + "machine.lua"), "=machine", "t")
     lua.newThread() // Left as the first value on the stack.
 
     true