From 3230aa20d677e8cf28fa6ce0e375ba5f701b3584 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Fri, 6 Jan 2017 20:34:16 +0300
Subject: [PATCH] aefa

---
 .DS_Store                            | Bin 18436 -> 18436 bytes
 Applications.txt                     |   6 +++---
 Applications/.DS_Store               | Bin 73732 -> 73732 bytes
 Applications/Photoshop/Photoshop.lua |   2 +-
 MineOS/Init.lua                      |   5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 9a77c9b105f56d79881737f1a33fba4f91dc6eab..b9e70176f75fefea84845c9b0efb1723f5005922 100644
GIT binary patch
delta 38
tcmZpfz}PZ@al>-4$!b>qo4<)A^D}h@Y>rmj&IF_<N2}Rw4$|Bt2LKvO4gLTC

delta 43
ycmZpfz}PZ@al>*k4pR#Q9R(9(!_Di(R`D}U*|0fUZ95Z?o*b=aw>e02lN<m-6%QK#

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 16644f81e9255bf967245d8ad215784537a28934..9c520b307f258a8f88512c6e0e1a339ad0c5842d 100644
GIT binary patch
delta 27
gcmZoUz|wMnWy99xlRqW;Z)RC>$q>v?y>;Ie0K}sXKL7v#

delta 27
lcmV+$0ObFKzyyTA1hBQIlOK{#vjnKpF_XPHPqQW3-$l0Y4L|?@

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()