From 628eb56613a7347db74d7b19db6aa8cfafa36e51 Mon Sep 17 00:00:00 2001 From: xAnavrins Date: Tue, 16 Jul 2019 22:29:10 -0400 Subject: [PATCH] Fix apps.db and legacy icon transparency --- common/etc/apps.db | 111 ++++++++++++++++++++------------------------ farms/etc/apps.db | 4 +- games/etc/apps.db | 26 ++++------- mbs/etc/apps.db | 2 +- miners/etc/apps.db | 10 ++-- monitor/etc/apps.db | 4 +- neural/etc/apps.db | 6 +-- turtle/etc/apps.db | 2 +- 8 files changed, 70 insertions(+), 95 deletions(-) diff --git a/common/etc/apps.db b/common/etc/apps.db index 2e21f9a..7e6a4ad 100644 --- a/common/etc/apps.db +++ b/common/etc/apps.db @@ -1,72 +1,61 @@ { - [ "c5497bca58468ae64aed6c0fd921109217988db3" ] = { - title = "Events", - category = "System", - icon = "\0300\031 \159\135\030 \0310\156\0301\031 \159\030 \0311\144\0300\031 \147\139\030 \0310\144\010\0300\128\128\030 \149\0311\157\142\0300\031 \149\0310\128\128\010\030 \130\139\141\0311\130\131\0310\142\135\129", - iconExt = "\0300\031 \159\135\030 \0310\156\0301\031 \159\030 \0311\144\0300\031 \147\139\030 \0310\144\010\0300\128\128\030 \149\0311\157\142\0300\031 \149\0310\128\128\010\030 \130\139\141\0311\130\131\0310\142\135\129", - run = "Events.lua", - }, - [ "f1e14c30480042e8c71b5482d92ef161815b915e" ] = { - title = "DiskCopy", - category = "System", - run = "DiskCopy", - iconExt = "\0305\0318\138\0303\159\0305\0317\133\030 \0315\148\031 \128\0318\151\129\010\0300\0315\149\030b\0318\138\143\0317\133\030 \031b\148\0308\031 \140\030 \0318\145\010\030 \031 \128\0300\031b\149\0310\128\128\030 \031b\149\0318\157\133", - }, - [ "7ef35cac539f84722b0a988caee03b2df734c56a" ] = { - title = "AppStore", - category = "System", - icon = "\030 \0310=\0300 \030 XX\0300\031f \030 \ -\030 \031f \0300 \030 \ -\030 \031f \0310o \031f \0310o\031f ", - iconExt = "\030 \031e\139\0318\151\151\151\151\151\149\010\030 \031 \128\0308\136\136\136\136\030 \0318\135\031 \128\010\030 \031 \128\0317\130\031 \128\0317\130\031 \128\128\128", - run = "Appstore.lua", - }, - [ "90ef98d4b6fd15466f0a1f212ec1db8d9ebe018c" ] = { - title = "Turtles", - category = "Apps", - icon = " \0305 \030c \0305 \030 \ -\030d \030c \0305 \030c \0308 \030d\031f\"\ - \0308\031f.\030 \031 \0308\031f.\030 \031 ", - iconExt = "\030 \031 \128\0305\135\030c\031c\128\128\0305\031 \139\0307\149\0308\0317\143\0307\128\010\030c\031 \145\031c\128\030d\132\136\030c\128\0307\149\0318\143\133\010\030 \031 \128\0317\143\031 \128\128\0317\143\031 \128\128\128", - run = "Turtles.lua", - }, - [ "66587a7a62a90fc91c4c88f1872bedaa52d23a35" ] = { - title = "Follow", - category = "Turtle", - run = "Follow.lua", - iconExt = "\030 \031 \128\128\128\128\128\128\0314\144\031 \128\010\030 \031 \128\128\128\128\0304\139\133\0310\130\030 \0311\156\010\0307\0318\136\030 \0317\149\0307\0318\136\030 \0317\149\0304\031 \144\0314\128\030 \159\031 \128", - }, - [ "df485c871329671f46570634d63216761441bcd6" ] = { - title = "Devices", - category = "System", - icon = "\0304 \030 \ -\030f \0304 \0307 \030 \031 \031f_\ -\030f \0304 \0307 \030 \031f/", - iconExt = "\030 \031 \128\128\128\0308\159\143\0300\0317\151\0307\0310\140\148\010\0314\151\131\0304\031f\148\030 \0318\138\148\0307\0310\138\131\129\010\0304\031f\138\143\133\030 \0318\131\129\031 \128\128\128", - run = "Devices.lua", - }, - [ "114edfc04a1ab03541bdc80ce064f66a7cfcedbb" ] = { - title = "Recorder", - category = "Apps", - icon = "\030 \031f \031b \031foo \ -\030 \031f \030e\031b \030 \031f/\ -\030 \031b \030e \030 \031f\\", - iconExt = "\030 \031 \128\030e\143\030 \031e\144\031 \128\0304\149\0307\0314\131\131\030 \149\010\030e\031 \129\031e\128\128\030 \148\0304\031 \149\0307\0318\140\140\030 \0314\149\010\030 \031e\139\030e\128\030 \159\129\0314\130\131\131\129", - run = "recorder.lua", - }, + [ "c5497bca58468ae64aed6c0fd921109217988db3" ] = { + title = "Events", + category = "System", + iconExt = "\0300\031 \159\135\030 \0310\156\0301\031 \159\030 \0311\144\0300\031 \147\139\030 \0310\144\010\0300\128\128\030 \149\0311\157\142\0300\031 \149\0310\128\128\010\030 \130\139\141\0311\130\131\0310\142\135\129", + run = "Events.lua", + }, + [ "f1e14c30480042e8c71b5482d92ef161815b915e" ] = { + title = "DiskCopy", + category = "System", + run = "DiskCopy", + iconExt = "\0305\0318\138\0303\159\0305\0317\133\030 \0315\148\031 \128\0318\151\129\010\0300\0315\149\030b\0318\138\143\0317\133\030 \031b\148\0308\031 \140\030 \0318\145\010\030 \031 \128\0300\031b\149\0310\128\128\030 \031b\149\0318\157\133", + }, + [ "7ef35cac539f84722b0a988caee03b2df734c56a" ] = { + title = "AppStore", + category = "System", + icon = "\030 \0310=\0300 \030 XX\0300\031f \030 \010\030 \031f \0300 \030 \010\030 \031f \0310o \031f \0310o\031f ", + iconExt = "\030 \031e\139\0318\151\151\151\151\151\149\010\030 \031 \128\0308\136\136\136\136\030 \0318\135\031 \128\010\030 \031 \128\0317\130\031 \128\0317\130\031 \128\128\128", + run = "Appstore.lua", + }, + [ "90ef98d4b6fd15466f0a1f212ec1db8d9ebe018c" ] = { + title = "Turtles", + category = "Apps", + icon = " \0305 \030c \0305 \030 \010\030d \030c \0305 \030c \0308 \030d\031f\"\010 \0308\031f.\030 \031 \0308\031f.\030 \031 ", + iconExt = "\030 \031 \128\0305\135\030c\031c\128\128\0305\031 \139\0307\149\0308\0317\143\0307\128\010\030c\031 \145\031c\128\030d\132\136\030c\128\0307\149\0318\143\133\010\030 \031 \128\0317\143\031 \128\128\0317\143\031 \128\128\128", + run = "Turtles.lua", + }, + [ "66587a7a62a90fc91c4c88f1872bedaa52d23a35" ] = { + title = "Follow", + category = "Turtle", + run = "Follow.lua", + iconExt = "\030 \031 \128\128\128\128\128\128\0314\144\031 \128\010\030 \031 \128\128\128\128\0304\139\133\0310\130\030 \0311\156\010\0307\0318\136\030 \0317\149\0307\0318\136\030 \0317\149\0304\031 \144\0314\128\030 \159\031 \128", + }, + [ "df485c871329671f46570634d63216761441bcd6" ] = { + title = "Devices", + category = "System", + icon = "\0304 \030 \010\030f \0304 \0307 \030 \031 \031f_\010\030f \0304 \0307 \030 \031f/", + iconExt = "\030 \031 \128\128\128\0308\159\143\0300\0317\151\0307\0310\140\148\010\0314\151\131\0304\031f\148\030 \0318\138\148\0307\0310\138\131\129\010\0304\031f\138\143\133\030 \0318\131\129\031 \128\128\128", + run = "Devices.lua", + }, + [ "114edfc04a1ab03541bdc80ce064f66a7cfcedbb" ] = { + title = "Recorder", + category = "Apps", + icon = "\030 \031f \031b \031foo \010\030 \031f \030e\031b \030 \031f/\010\030 \031b \030e \030 \031f\\", + iconExt = "\030 \031 \128\030e\143\030 \031e\144\031 \128\0304\149\0307\0314\131\131\030 \149\010\030e\031 \129\031e\128\128\030 \148\0304\031 \149\0307\0318\140\140\030 \0314\149\010\030 \031e\139\030e\128\030 \159\129\0314\130\131\131\129", + run = "recorder.lua", + }, [ "5c7e3aec1f9179ce3325a4f7a101dca65ac905f3" ] = { title = "Swarm", category = "Turtle", - requires = "neuralInterface", - icon = " \0315\\\030 \031 \ - \0304\031f _ \030 \031c/\0315\\\ - \0304 ", + requires = "neuralInterface", + icon = "\030 \0315\\\030 \031 \010\030 \0304\031f _ \030 \031c/\0315\\\010\030 \0304 ", run = "multiMiner.lua", }, - [ "783ecb3650eabd68f3caadc387abd23018132967" ] = { + [ "783ecb3650eabd68f3caadc387abd23018132967" ] = { title = "HexEdit", category = "Apps", - requires = "advancedComputer", + requires = "advancedComputer", iconExt = "\030 \031 \128\030d\159\030 \031d\140\030d\031 \155\030 \0315\140\0305\031 \155\030 \128\010\030 \031d\136\145\0315\136\145\031d\153\031 \128\0315\153\010\030 \031 \128\031d\130\140\134\0315\140\134\031 \128", run = "packages/common/hexedit.lua", }, diff --git a/farms/etc/apps.db b/farms/etc/apps.db index 38806c4..4c5c9e4 100644 --- a/farms/etc/apps.db +++ b/farms/etc/apps.db @@ -1,9 +1,7 @@ { [ "8d1b0a73bedc0dc492377c2f6ab880940b97ec6e" ] = { title = "Treefarm", - icon = "\030 \031f \0305 \030 \030d \030 \ -\0305\031f \030d \030 \030d \0305 \030d \ -\030 \031f \030c \030 \0304 \030 \030c \030 ", + icon = "\030 \031f \0305 \030 \030d \030 \010\0305\031f \030d \030 \030d \0305 \030d \010\030 \031f \030c \030 \0304 \030 \030c \030 ", category = "Farms", run = "treefarm.lua", requires = "turtle", diff --git a/games/etc/apps.db b/games/etc/apps.db index 45ea22f..11aaac5 100644 --- a/games/etc/apps.db +++ b/games/etc/apps.db @@ -23,36 +23,30 @@ run = "SoundPlayer", iconExt = "\030 \031 \128\0307\159\129\030 \0317\149\0310\144\0300\031 \155\030 \0310\137\144\010\0307\0317\128\128\128\030 \149\0300\031 \149\030 \128\0310\149\0300\031 \149\010\030 \031 \128\0317\130\0307\031 \144\030 \0317\149\0310\129\134\152\129", }, - [ "a2accffe95b2c8be30e8a05e0c6ab7e8f5966f43" ] = { - title = "Strafe", - category = "Games", - icon = "\0308\031f \0300 \0308 \ -\0308\031f \0300 \030f \ -\0300\031f \030f ", - iconExt = "\0308\0318\128\0300\159\129\0310\128\0308\159\129\0318\128\010\0300\0318\135\0310\128\128\030f\135\0300\031f\143\159\030f\0310\144\010\0300\128\030f\159\129\138\0300\031f\143\149\030f\0310\134", - run = "Strafe", - }, + [ "a2accffe95b2c8be30e8a05e0c6ab7e8f5966f43" ] = { + title = "Strafe", + category = "Games", + icon = "\0308\031f \0300 \0308 \010\0308\031f \0300 \030f \010\0300\031f \030f ", + iconExt = "\0308\0318\128\0300\159\129\0310\128\0308\159\129\0318\128\010\0300\0318\135\0310\128\128\030f\135\0300\031f\143\159\030f\0310\144\010\0300\128\030f\159\129\138\0300\031f\143\149\030f\0310\134", + run = "Strafe", + }, [ "48d6857f6b2869d031f463b13aa34df47e18c548" ] = { title = "Breakout", category = "Games", - icon = "\0301\031f \0309 \030c \030b \030e \030c \0306 \ -\030 \031f \ -\030 \031f \0300 \0310 ", + icon = "\0301\031f \0309 \030c \030b \030e \030c \0306 \010\030 \031f \010\030 \031f \0300 \0310 ", iconExt = "\030 \0319\144\030d\031 \159\030b\159\030 \0311\144\031b\144\030c\031 \159\030 \0311\144\010\030 \0311\130\031b\129\0319\130\031e\130\0310\144\031d\129\0316\129\010\030 \136\140\140\031 \128\128\128\128", run = "Breakout", }, [ "53a5d150062b1e03206b9e15854b81060e3c7552" ] = { title = "Minesweeper", category = "Games", - icon = "\030f\031f \03131\0308\031f \030f\031d2\ -\030f\031f \031d2\03131\0308\031f \030f\03131\ -\030f\03131\0308\031f \030f\03131\031e3", + icon = "\030f\031f \03131\0308\031f \030f\031d2\010\030f\031f \031d2\03131\0308\031f \030f\03131\010\030f\03131\0308\031f \030f\03131\031e3", run = "Minesweeper", }, [ "4e404681d4fa9e04ae2bb63d82f58a9733fa605a" ] = { title = "Tron", category = "Games", - iconExt = "\030 \031f\030b\031f\143\030f\128\128\030b\143\143\143\030f\128\128\010\030 \031f\0309\031b\140\030b\031f\151\030f\031b\131\0307\148\0317\128\030b\151\030f\031b\131\148\010\030 \031f\030f\031b\131\031f\128\031b\131\0317\131\031f\128\0317\131\031b\131\031f\128", + iconExt = "\030 \031f\030b\031f\143\030f\128\128\030b\143\143\143\030f\128\128\010\030 \031f\0309\031b\140\030b\031f\151\030f\031b\131\0307\148\0317\128\030b\151\030f\031b\131\148\010\030 \031f\030f\031b\131\031f\128\031b\131\0317\131\031f\128\0317\131\031b\131\031f\128", run = "Tron", }, } diff --git a/mbs/etc/apps.db b/mbs/etc/apps.db index f3e73b5..2b13ce3 100644 --- a/mbs/etc/apps.db +++ b/mbs/etc/apps.db @@ -1,5 +1,5 @@ { - [ "mbs" ] = { + [ "a3c2cb0e2228250d98c481128f6837ef93111d73" ] = { title = "MBS", category = "Apps", run = ".mbs/bin/shell.lua", diff --git a/miners/etc/apps.db b/miners/etc/apps.db index 7f40823..4d0341f 100644 --- a/miners/etc/apps.db +++ b/miners/etc/apps.db @@ -2,18 +2,14 @@ [ "4486006f811b88cacd5f211fd579717e29b600cd" ] = { title = "Simple", category = "Mining", - icon = " \0315\\\030 \031 \ - \0304\031f _ \030 \031c/\0315\\\ - \0304 ", + icon = "\030 \0315\\\030 \031 \010\030 \0304\031f _ \030 \031c/\0315\\\010\030 \0304 ", run = "simpleMiner.lua", requires = 'turtle', }, - [ "scanningMiner" ] = { + [ "da39a3ee5e6b4b0d3255bfef95601890afd80709" ] = { title = "Scanning", category = "Mining", - icon = " \0315\\\030 \031 \ - \0304\031f _ \030 \031c/\0315\\\ - \0304 ", + icon = "\030 \0315\\\030 \031 \010\030 \0304\031f _ \030 \031c/\0315\\\010\030 \0304 ", run = "scanningMiner.lua", requires = 'turtle', }, diff --git a/monitor/etc/apps.db b/monitor/etc/apps.db index 7b170a4..ab9f1f9 100644 --- a/monitor/etc/apps.db +++ b/monitor/etc/apps.db @@ -2,9 +2,7 @@ [ "58ec8d6e36e346d9f42eb43935652e3e58e2c829" ] = { title = "Mwm", category = "Apps", - icon = "\030f\031f \0304 \ -\030f\031dshell]\0304\0314 \ -\0304\031f ", + icon = "\030f\031f \0304 \010\030f\031dshell]\0304\0314 \010\0304\031f ", iconExt = "\030 \031f\0305\031f\155\030f\128\031d\152\140\030d\031f\151\030f\128\128\0304\0314\128\010\030 \031f\030f\0315\152\129\030d\031f\141\030f\031d\153\030d\031f\149\030f\031d\131\148\0304\0314\128\010\030 \031f\0304\031f\131\131\131\131\131\131\131\030e\0314\131", run = "mwm.lua usr/config/mwm", }, diff --git a/neural/etc/apps.db b/neural/etc/apps.db index b11b91f..61040b2 100644 --- a/neural/etc/apps.db +++ b/neural/etc/apps.db @@ -1,11 +1,11 @@ { - [ "elytraFly" ] = { + [ "62b381dad87f9d9caeb4358c8bbeba88cf2268a2" ] = { title = "ElytraFly", category = "Neural", run = "elytraFly.lua", requires = "neuralInterface", }, - [ "fisher" ] = { + [ "0d57bd5497ca26a92593094bf3e21c5097192fa3" ] = { title = "Fisher", category = "Neural", run = "fisher.lua", @@ -23,7 +23,7 @@ run = "Scanner.lua", iconExt = "\030d\031 \143\143\030 \031d\144\0300\031 \135\030e\0310\151\0300\031 \130\030 \0310\144\031 \128\010\030c\031d\129\130\030 \031c\149\030b\031f\132\0300\031b\132\030e\0310\155\0306\149\030 \031 \128\010\030 \031c\143\143\133\0310\139\0300\031e\138\030 \0310\159\129\0316\149", }, - [ "orescanner" ] = { + [ "fb219dd7bd048eab5c4ce7d35644f34b19a6f388" ] = { title = "Ores", category = "Neural", run = "ores.lua", diff --git a/turtle/etc/apps.db b/turtle/etc/apps.db index 831ebe8..446212f 100644 --- a/turtle/etc/apps.db +++ b/turtle/etc/apps.db @@ -5,7 +5,7 @@ run = "lavaRefuel.lua", requires = 'turtle', }, - [ "obsidian" ] = { + [ "24c869802c3e242e28585a1c90c21847f259e4f8" ] = { title = "Obsidian", category = "Turtle", run = "obsidian.lua",