diff --git a/.DS_Store b/.DS_Store index b7e47a3c..35086798 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index 60f1eca0..bfef6ba4 100644 --- a/Applications.txt +++ b/Applications.txt @@ -524,7 +524,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/SmartHouse/Icon.pic", createShortcut="desktop", - version=1.26, + version=1.27, resources={ { name="Modules/command_block/Icon.pic", @@ -562,6 +562,10 @@ url="IgorTimofeev/OpenComputers/master/Applications/SmartHouse/Modules/screen/Main.lua", }, -- + { + name="Modules/homePC/Server.pic", + url="IgorTimofeev/OpenComputers/master/Applications/SmartHouse/Modules/homePC/Server.pic", + }, { name="Modules/homePC/Icon.pic", url="IgorTimofeev/OpenComputers/master/Applications/SmartHouse/Modules/homePC/Icon.pic", @@ -612,8 +616,12 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/Control2/Icon.pic", createShortcut="desktop", - version=1.00, + version=1.01, resources={ + { + name="LuaLogo.pic", + url="IgorTimofeev/OpenComputers/master/Applications/Control2/LuaLogo.pic", + }, { name="Modules/00_LuaConsole.lua", url="IgorTimofeev/OpenComputers/master/Applications/Control2/Modules/00_LuaConsole.lua", diff --git a/Installer/Installer.lua b/Installer/Installer.lua index 3caef05c..b5d76f14 100644 --- a/Installer/Installer.lua +++ b/Installer/Installer.lua @@ -299,7 +299,7 @@ do local function drawInfo(x, y, info) ecs.square(x, y, barWidth, 1, ecs.windowColors.background) - ecs.colorText(x, y, ecs.colors.gray, info) + ecs.colorText(x, y, ecs.colors.gray, ecs.stringLimit("end", info, barWidth)) end ecs.blankWindow(xWindow,yWindow,windowWidth,windowHeight)