diff --git a/Applications/HoloEdit/HoloEdit.lua b/Applications/HoloEdit/HoloEdit.lua index 1b1d50f8..377b7a15 100644 --- a/Applications/HoloEdit/HoloEdit.lua +++ b/Applications/HoloEdit/HoloEdit.lua @@ -10,7 +10,7 @@ local com = require('component') local gpu = com.gpu local config = require("config") -local lang = config.readAll("HoloEdit.app/Resources/" .. _OSLANGUAGE .. ".lang") +local lang = config.readAll("MineOS/Applications/HoloEdit.app/Resources/" .. _OSLANGUAGE .. ".lang") -- Константы -- HOLOH = 32 diff --git a/Applications/Pastebin/Pastebin.lua b/Applications/Pastebin/Pastebin.lua index a533d245..965a29db 100644 --- a/Applications/Pastebin/Pastebin.lua +++ b/Applications/Pastebin/Pastebin.lua @@ -10,6 +10,7 @@ local context = require("context") local xml = require("xmlParser") local config = require("config") local unixtime = require("unixtime") +local SHA2 = require("SHA2") -- local computer = require("computer") -- local keyboard = require("keyboard") -- local image = require("image") @@ -318,7 +319,7 @@ end local function inputPassword() --local massiv = ecs.input("auto", "auto", 20, "Войти в Pastebin", {"input", "Логин", ""}, {"input", "Пароль", ""}) - local data = ecs.universalWindow("auto", "auto", 24, tabColor1, true, {"EmptyLine"}, {"CenterText", 0xffffff, "Авторизация"}, {"EmptyLine"}, {"Input", 0xffffff, tabColor2, "Логин"}, {"Input", 0xffffff, tabColor2, "Пароль", "●"}, {"EmptyLine"}, {"Button", {tabColor2, 0xffffff, "Войти в аккаунт"}, {0x006dbf, 0xffffff, "Отмена"}}) + local data = ecs.universalWindow("auto", "auto", 24, tabColor1, true, {"EmptyLine"}, {"CenterText", 0xffffff, "Авторизация"}, {"EmptyLine"}, {"Input", 0xffffff, 0xccccff, "Логин"}, {"Input", 0xffffff, 0xccccff, "Пароль", "●"}, {"EmptyLine"}, {"Button", {tabColor2, 0xffffff, "Войти в аккаунт"}, {0x006dbf, 0xffffff, "Отмена"}}) if data[3] == "Отмена" then return false end