From 92a77780df5593c962f17fb36af7f6dd047134cd Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Wed, 11 Jan 2017 17:45:59 +0300 Subject: [PATCH] =?UTF-8?q?=D1=84=D1=83=D0=B0=D1=84=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 18436 -> 18436 bytes Applications.txt | 2 +- lib/MineOSCore.lua | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.DS_Store b/.DS_Store index 88d13124e5d725ef7a5b947a35302566f118cd56..9ac708fd378f22c313920b28ad6e0878fd9cd235 100644 GIT binary patch delta 474 zcmXYt%Wq6!9EQ&m#QEZr`DR*^&e3kBqbf=&q|r$mYB6ZFEQVH#IPE!YPR*ry#<(uW zWhA1>CqzQrLL?T{Xk0eRUtrOdm9>o(2^&t&*#3Uco9E42nWHkts~$yM_o~`T*(l@s z%a*1cqn_gyO5UXB&Wb2YB3rQY?ovcWV=`f_7iz&g=GY~7u;?r^PWaLD8ycoUBx$9D zvdygTUHBi`C^re^i|i?{P=~D!xz$vTIGnS`-CUTrw#n_L8W6)}ch>ich5E5e?lhxx zh>?k6J|A@Q>#ogh&B{txeWrPIxk#VmxQ@Qr*rHd&S|`35-;D3ZPve*I+xTPr#YC_M zNrEJ;r0ArZG(GgPhXD>S#6hwg=L9FQnPP_1_>{QBWv)==I+}aj=K&9S$vfWjL04lV ztDE=j?~llg-lZPtYQwZHx3@)_f_-FCro!2jp3iIk)_(vUaYAtL88Mt7B<^LC@LLE^_l||m|k+j)+Wz9}+ zi!Q8sJgY6z+uG?f#DtkHTjNDDm(5wGT-NJOm(MU#j&oqvQn#t=Zb2Yuh(swjZ^?Ay zV<;>{Vk%cKWvS7$CnAg!`Sdv}FHKLqthY}Xr!HBurChNfM?E9;*PXkBk<1jQr>#P{ zac?#wssyY@r-rTy0a zXn(bT=yb4&PJ9H3vYlRbvyV7~>}Qmt9OF0%&XB<(%XwzF%sf}Q#&zy+kNem><`u7b z!&^S_nJ;#=HM!nDJaV{24A}$niCt}*v;)nd1x0alASi^?yf|bX9SZyXa*e{NyRs+Z z7qZEP=D3Q7UpBjV9H~GExz+{f$XLH}*C|f*+JU%grMn0mcPOk{p?mc1cxH>Hj=j`= zC>3Rg%6E`qm2Ql2PLd?Wgi4s@0+URU=OS}laZ^^f!A+{%QYjzskR=}RlxIBW1uuC| bjb%RYkrgL*E!OdKD}DCL#_`%*?DmHL+pv$- diff --git a/Applications.txt b/Applications.txt index 20e6751f..311f9fd2 100644 --- a/Applications.txt +++ b/Applications.txt @@ -253,7 +253,7 @@ name="lib/MineOSCore.lua", url="IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua", type="Library", - version=1.37, + version=1.38, }, { name="lib/advancedLua.lua", diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua index 1e4a25d7..dafe3529 100755 --- a/lib/MineOSCore.lua +++ b/lib/MineOSCore.lua @@ -238,7 +238,7 @@ local function waitForPressingAnyKey() end end -function MineOSCore.analyseIconFormat(iconObject) +function MineOSCore.analyzeIconFormat(iconObject) if iconObject.isDirectory then if iconObject.format == ".app" then if MineOSCore.showApplicationIcons then @@ -264,7 +264,7 @@ function MineOSCore.analyseIconFormat(iconObject) iconObject.shortcutIsDirectory = fs.isDirectory(iconObject.shortcutPath) iconObject.isShortcut = true - local shortcutIconObject = MineOSCore.analyseIconFormat({ + local shortcutIconObject = MineOSCore.analyzeIconFormat({ path = iconObject.shortcutPath, format = iconObject.shortcutFormat, isDirectory = iconObject.shortcutIsDirectory, @@ -385,7 +385,7 @@ function MineOSCore.createIconObject(x, y, path, textColor, showFileFormat) end -- Онализ формата и прочего говна иконки для последующего получения изображения иконки и функции-лаунчера - MineOSCore.analyseIconFormat(iconObject) + MineOSCore.analyzeIconFormat(iconObject) return iconObject end