Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

src/main/resources/assets/opencomputers/lua/rom/bin/ls.lua

@@ -37,7 +37,7 @@ for i = 1, #dirs do
     end
     table.sort(lsd)
     table.sort(lsf)
-    setColor(0x99CCFF)
+    setColor(0x66CCFF)
     for _, d in ipairs(lsd) do
       if options.a or d:sub(1, 1) ~= "." then
         io.write(d .. "\t")

src/main/resources/assets/opencomputers/lua/rom/lib/shell.lua

@@ -14,7 +14,7 @@ local function findFile(name, ext)
       dir = shell.resolve(dir)
     end
     dir = fs.concat(fs.concat(dir, name), "..")
-    name = fs.name(name)
+    local name = fs.name(name)
     local list = fs.list(dir)
     if list then
       local files = {}