diff --git a/.DS_Store b/.DS_Store index 9a77c9b1..b9e70176 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index 0f4ba491..135c97b8 100644 --- a/Applications.txt +++ b/Applications.txt @@ -460,7 +460,7 @@ url="IgorTimofeev/OpenComputers/master/MineOS/Init.lua", type="Script", forceDownload=true, - version=1.12, + version=1.13, }, { name="etc/profile", @@ -1152,11 +1152,11 @@ version=1.01, resources={ { - name="Russian.lang", + name="Localization/Russian.lang", url="IgorTimofeev/OpenComputers/master/Applications/HoloEdit/Localization/Russian.lang", }, { - name="English.lang", + name="Localization/English.lang", url="IgorTimofeev/OpenComputers/master/Applications/HoloEdit/Localization/English.lang", }, }, diff --git a/Applications/.DS_Store b/Applications/.DS_Store index 16644f81..9c520b30 100644 Binary files a/Applications/.DS_Store and b/Applications/.DS_Store differ diff --git a/Applications/Photoshop/Photoshop.lua b/Applications/Photoshop/Photoshop.lua index feec8033..a8067640 100755 --- a/Applications/Photoshop/Photoshop.lua +++ b/Applications/Photoshop/Photoshop.lua @@ -57,6 +57,7 @@ copyright = nil local ecs = require("ECSAPI") local MineOSCore = require("MineOSCore") +local GUI = require("GUI") local fs = require("filesystem") local unicode = require("unicode") local image = require("image") @@ -66,7 +67,6 @@ local buffer = require("doubleBuffering") local colorlib = require("colorlib") local palette = require("palette") local event = require("event") -local files = require("files") ------------------------------------------------ Переменные -------------------------------------------------------------- diff --git a/MineOS/Init.lua b/MineOS/Init.lua index e8eb5134..58585320 100755 --- a/MineOS/Init.lua +++ b/MineOS/Init.lua @@ -173,8 +173,9 @@ end -- MineOS Init data do -- Загружаем необходимые библиотеки, дабы избежать потерь памяти - _G.shell = require("shell"); shell.setWorkingDirectory("") - _G.ecs = require("ECSAPI") + local shell = require("shell"); shell.setWorkingDirectory("") + local ecs = require("ECSAPI") + local component = require("component") -- Загружаем параметры ОС ecs.loadOSSettings()