From 4872e5adb8bfcb75dc3bb79e77b61b62b33ed788 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Sat, 14 Jan 2017 06:12:40 +0300
Subject: [PATCH] aefaef

---
 .DS_Store                              | Bin 18436 -> 18436 bytes
 Applications.txt                       |   4 ++--
 Applications/.DS_Store                 | Bin 79876 -> 79876 bytes
 Applications/SmartHouse/SmartHouse.lua |  13 ++-----------
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index df3f402a43dfe58acdc463a182022e60be66be34..355bafd9d4a73dfe0aee09c7d7676bf1eb4eefc3 100644
GIT binary patch
delta 561
zcmXYt&2J209LMLgTAqhVJX?wE&JLm)lSx*E(vU`NTB=DkjdWMNG}!KpWNKe@cZo<?
zFFg{=gpdkx6GBKi=^x-o(l|Ldxp9%;XkJ{N<oEqPZ=cV6oB1|x-t{Ebjreocg8xko
zwth&t+@+Fh^|X<Z>b;nDicNRC=6Gj4*NGY<ZEO<aWS9@v-C&Jlz1!%Kswnae@3I?T
zVd=J14VgdZRsSE&>b*iavQRG0xaIh^9eSToV{+=ETW@%^UDY`4*Y}7dS$V8ft5n=-
zvk}Jw#y+7wic{g^hl`Eo#Cf;sI{xQmDsk8Gr?(E3zGz>y@7ho8m-buxqx}UEbkIo`
z8B8`{vy(n{)6W10ILIMJ8RsZd9OndQ@R+4cg$rDz#SLz9i~Bs_A&+>@TRyPlW6feN
zmaWzJpSGo1g#gdJ6n$5%TF#`6)aGtoS6Y%#W-1VATBa=mnJN*Dde-a>RjCzm8!2$4
z>WtffJ=CT;;&wm}n8&1A8IL)0C{&<CyxB6v8Y#q<T*N=<PulAzZML(Q{p1)97)O}k
z2zd$t<>`QMh7vASYRplm$(4Zg8rLJz+uWheJr;P(6Q1&n7rf*ZuNRl>(T)EAe1wIV

delta 491
zcmXw#OKTHh6o%(<HDf=TnHXd8wOXw;(`ZXoyikQ|ycDG^3W@h%9P^DZnoMjGT?kq)
z1wlokgR3Gch)NM}(T(^c1iNu3xK_b#Tsnz$a~AJ=4$s4xZZO^8&HKJZ@zG$?o{7zN
zF6&;oX6?|X;gPwBX+=d$#DmX+iK*kBa{an@#&fHN#SbIrJ7sq+YFd#*Qi{BC>h45E
zwR&ZK(2aJpJSpXgR<pb6hEwT!J6_c*MXu&ua!qGpF=Y#pJLmbztQr4K*9{1HsN|e>
zOQtfyv!M{QeuI!lF1pp4SMklURvLzzw+MN(SSgo7yPCzoLL7Xwx|hnN%;@^DmO)0T
zkiUB8)o(#QwX66=`>K7{ermt8-`c$P2k6AaB1#uF{iNB*R)*QecJ{EJF~*tTFnLZ=
z;1nK{)TncTE8OH3x4FXup7M<6yx=YGXa?A4>1mei#RT(9QjxBtOo(35*Z!WV1^ux?
zM~B@bbmPC)NRUm(vo?bvdIy;hyq8f9aF8sy5MIEch{DC^Jk_?qWu~~sb#8<LcWH2s
X`^@l=M?B^Uv%KULubZFJ`&Rq~&#-$y

diff --git a/Applications.txt b/Applications.txt
index 2bd829bd..4eac2f14 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -537,7 +537,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/SmartHouse/Icon.pic",
     createShortcut="desktop",
-    version=1.28,
+    version=1.29,
     resources={
       {
         name="Modules/command_block/Icon.pic",
@@ -885,7 +885,7 @@
     type="Application",
     icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic",
     createShortcut="desktop",
-    version=1.03,
+    version=1.04,
   },
   {
     name="MineOS/Applications/Battleship",
diff --git a/Applications/.DS_Store b/Applications/.DS_Store
index d5ad6a6af3ce4289e31a72b9061bc41ce099d37c..744927d6b0a6bb5221992153b314377f18f662d2 100644
GIT binary patch
delta 21
dcmZqqz|!)8rC|%>4B^Q)9Rjw$5N4E70RU^y2*3aU

delta 30
mcmZqqz|!)8rC|%>3}FsaV@n+cLra6n4;?(VzYu1WQ2_w13JOmE

diff --git a/Applications/SmartHouse/SmartHouse.lua b/Applications/SmartHouse/SmartHouse.lua
index a3fa3e7b..a6d322ff 100755
--- a/Applications/SmartHouse/SmartHouse.lua
+++ b/Applications/SmartHouse/SmartHouse.lua
@@ -40,15 +40,6 @@ local offset = {x = 0, y = 0}
 
 -----------------------------------------------------------------------------------------------------------------------------------
 
-local function getComputerInfo()
-	local currentComputerAddress = computer.address()
-	for address, information in pairs(computer.getDeviceInfo()) do
-		if currentComputerAddress == address then
-			return information.description
-		end
-	end
-end
-
 local function loadModule(modulePath)
 	local success, module = pcall(loadfile(modulePath .. "/Main.lua"))
 	if success then
@@ -345,8 +336,8 @@ local function createWindow()
 
 	-- Создаем главное и неебически важное устройство домашнего писюка
 	local homePC = createDevice(math.floor(window.width / 2 - 8), math.floor(window.height / 2 - 4), "homePC", component.proxy(computer.address()), "Сервак")
-	local computerDescription = getComputerInfo()
-	if computerDescription == "Server" then homePC.module.icon = image.load(homePC.module.modulePath .. "Server.pic"); homePC.deviceImage.image = homePC.module.icon end
+	homePC.module.icon = image.load(homePC.module.modulePath .. "Server.pic")
+	homePC.deviceImage.image = homePC.module.icon
 
 	-- Перед отрисовкой окна чистим буфер фоном и перехуячиваем позиции объектов групп
 	window.onDrawStarted = function()