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

src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua

@@ -253,6 +253,23 @@ if #args == 0 and (io.input() == io.stdin or options.i) and not options.c then
       end
     end
   end
+elseif #args == 0 and (io.input() ~= io.stdin) then
+  while true do
+    io.write(expand(os.getenv("PS1") or "$ "))
+    local command = io.read("*l")
+    if not command then
+      io:write("exit\n")
+    end
+    command = text.trim(command)
+    if command == "exit" then
+      return
+    elseif command ~= "" then
+      local result, reason = os.execute(command)
+      if not result then
+        io.stderr:write((tostring(reason) or "unknown error").. "\n")
+      end
+    end
+  end
 else
   -- execute command.
   local result = table.pack(execute(...))

src/main/resources/assets/opencomputers/robot.names

@@ -24,6 +24,7 @@ Clamps             # Futurama
 Clank              # Ratchet & Clank
 Claptrap           # Borderlands
 Crypto             # Kodos
+Daedalus           # Deus Ex
 Dalek Sec          # Doctor Who
 Deputy ANDY        # Eureka
 Death Trap         # Borderlands 2's Mechromancer
@@ -40,6 +41,7 @@ HAL 9000           # Space Odyssey
 Harkness           # Fallout 3
 Heron              # Vexatos
 Homunk             # Perry Rhodan
+Icarus             # Deus Ex
 J.A.R.V.I.S        # Iron Man
 JoshTheEnder       # Contributor
 Johnny 5           # Short Circuit