From 68dfcfc4d7137482a56ceffc944af22850ff4e0f Mon Sep 17 00:00:00 2001 From: igor Date: Tue, 21 Nov 2017 09:02:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=20=D0=B2=D1=81=D1=8F=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.cfg | 2 +- lib/MineOSCore.lua | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Applications.cfg b/Applications.cfg index 04026655..b6267904 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -229,7 +229,7 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua", type="Library", preloadFile=true, - version=1.98, + version=1.99, }, { path="/lib/MineOSNetwork.lua", diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua index 3c230baa..9f5cc277 100755 --- a/lib/MineOSCore.lua +++ b/lib/MineOSCore.lua @@ -64,16 +64,6 @@ function MineOSCore.loadPropeties() MineOSCore.properties = table.fromFile(MineOSPaths.properties) else MineOSCore.properties = {} - - MineOSCore.associateExtension(".pic", MineOSPaths.applications .. "/Photoshop.app/Main.lua", MineOSPaths.icons .. "/Image.pic", MineOSPaths.extensionAssociations .. "Pic/ContextMenu.lua") - MineOSCore.associateExtension(".txt", MineOSPaths.editor, MineOSPaths.icons .. "/Text.pic") - MineOSCore.associateExtension(".cfg", MineOSPaths.editor, MineOSPaths.icons .. "/Config.pic") - MineOSCore.associateExtension(".3dm", MineOSPaths.applications .. "/3DPrint.app/Main.lua", MineOSPaths.icons .. "/3DModel.pic") - - MineOSCore.associateExtension("script", MineOSPaths.extensionAssociations .. "Lua/Launcher.lua", MineOSPaths.icons .. "/Script.pic", MineOSPaths.extensionAssociations .. "Lua/ContextMenu.lua") - MineOSCore.associateExtension(".lua", MineOSPaths.extensionAssociations .. "Lua/Launcher.lua", MineOSPaths.icons .. "/Lua.pic", MineOSPaths.extensionAssociations .. "Lua/ContextMenu.lua") - MineOSCore.associateExtension(".arc", MineOSPaths.extensionAssociations .. "Arc/Launcher.lua", MineOSPaths.icons .. "/Archive.pic") - saveLater = true end @@ -109,6 +99,15 @@ function MineOSCore.loadPropeties() }, } + MineOSCore.associateExtension(".pic", MineOSPaths.applications .. "/Photoshop.app/Main.lua", MineOSPaths.icons .. "/Image.pic", MineOSPaths.extensionAssociations .. "Pic/ContextMenu.lua") + MineOSCore.associateExtension(".txt", MineOSPaths.editor, MineOSPaths.icons .. "/Text.pic") + MineOSCore.associateExtension(".cfg", MineOSPaths.editor, MineOSPaths.icons .. "/Config.pic") + MineOSCore.associateExtension(".3dm", MineOSPaths.applications .. "/3DPrint.app/Main.lua", MineOSPaths.icons .. "/3DModel.pic") + + MineOSCore.associateExtension("script", MineOSPaths.extensionAssociations .. "Lua/Launcher.lua", MineOSPaths.icons .. "/Script.pic", MineOSPaths.extensionAssociations .. "Lua/ContextMenu.lua") + MineOSCore.associateExtension(".lua", MineOSPaths.extensionAssociations .. "Lua/Launcher.lua", MineOSPaths.icons .. "/Lua.pic", MineOSPaths.extensionAssociations .. "Lua/ContextMenu.lua") + MineOSCore.associateExtension(".arc", MineOSPaths.extensionAssociations .. "Arc/Launcher.lua", MineOSPaths.icons .. "/Archive.pic") + for key, value in pairs(defaultValues) do if MineOSCore.properties[key] == nil then MineOSCore.properties[key] = value