mirror of
https://github.com/IgorTimofeev/MineOS.git
synced 2025-12-20 19:19:21 +01:00
Фиксики
This commit is contained in:
parent
b9e6fa9795
commit
6f144ea44b
@ -204,7 +204,7 @@
|
|||||||
path="/lib/MineOSCore.lua",
|
path="/lib/MineOSCore.lua",
|
||||||
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
|
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
|
||||||
type="Library",
|
type="Library",
|
||||||
version=1.66,
|
version=1.67,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path="/lib/advancedLua.lua",
|
path="/lib/advancedLua.lua",
|
||||||
@ -264,7 +264,7 @@
|
|||||||
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/GUI.lua",
|
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/GUI.lua",
|
||||||
type="Library",
|
type="Library",
|
||||||
preloadFile=true,
|
preloadFile=true,
|
||||||
version=1.55,
|
version=1.56,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path="/lib/rayEngine.lua",
|
path="/lib/rayEngine.lua",
|
||||||
@ -449,7 +449,7 @@
|
|||||||
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic",
|
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic",
|
||||||
createShortcut="dock",
|
createShortcut="dock",
|
||||||
forceDownload=true,
|
forceDownload=true,
|
||||||
version=1.72,
|
version=1.73,
|
||||||
resources={
|
resources={
|
||||||
{
|
{
|
||||||
path="/Localization/Russian.lang",
|
path="/Localization/Russian.lang",
|
||||||
@ -507,7 +507,7 @@
|
|||||||
type="Application",
|
type="Application",
|
||||||
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Weather/Icon.pic",
|
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Weather/Icon.pic",
|
||||||
createShortcut="desktop",
|
createShortcut="desktop",
|
||||||
version=1.13,
|
version=1.14,
|
||||||
resources={
|
resources={
|
||||||
{
|
{
|
||||||
path="/Cloudy.pic",
|
path="/Cloudy.pic",
|
||||||
@ -693,7 +693,7 @@
|
|||||||
type="Application",
|
type="Application",
|
||||||
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/PrintImage/Icon.pic",
|
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/PrintImage/Icon.pic",
|
||||||
createShortcut="desktop",
|
createShortcut="desktop",
|
||||||
version=1.10,
|
version=1.11,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path="/MineOS/Applications/Palette",
|
path="/MineOS/Applications/Palette",
|
||||||
@ -709,7 +709,7 @@
|
|||||||
type="Application",
|
type="Application",
|
||||||
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Stargate/Icon.pic",
|
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Stargate/Icon.pic",
|
||||||
createShortcut="desktop",
|
createShortcut="desktop",
|
||||||
version=1.06,
|
version=1.07,
|
||||||
resources={
|
resources={
|
||||||
{
|
{
|
||||||
path="/Ch1.pic",
|
path="/Ch1.pic",
|
||||||
@ -833,7 +833,7 @@
|
|||||||
type="Application",
|
type="Application",
|
||||||
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/HoloClock/Icon.pic",
|
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/HoloClock/Icon.pic",
|
||||||
createShortcut="desktop",
|
createShortcut="desktop",
|
||||||
version=1.03,
|
version=1.04,
|
||||||
},
|
},
|
||||||
-- {
|
-- {
|
||||||
-- path="/MineOS/Applications/Finder",
|
-- path="/MineOS/Applications/Finder",
|
||||||
|
|||||||
@ -11,7 +11,7 @@ local GUI = require("GUI")
|
|||||||
--------------------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
if not component.isAvailable("hologram") then
|
if not component.isAvailable("hologram") then
|
||||||
GUI.error("This program needs a Tier 2 holo-projector!", {title = {color = 0xFFDB40, text = "HoloClock"}})
|
GUI.error("This program needs a Tier 2 holo-projector to work")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -768,7 +768,7 @@ local function downloadFileFromWeb()
|
|||||||
newFile()
|
newFile()
|
||||||
mainContainer.codeView.lines, mainContainer.codeView.maximumLineLength = splitStringIntoLines(result)
|
mainContainer.codeView.lines, mainContainer.codeView.maximumLineLength = splitStringIntoLines(result)
|
||||||
else
|
else
|
||||||
GUI.error(reason, {title = {color = 0xFFDB40, text = "Failed to connect to URL"}})
|
GUI.error("Failed to connect to URL: " .. tostring(reason))
|
||||||
end
|
end
|
||||||
hideSettingsContainer()
|
hideSettingsContainer()
|
||||||
end
|
end
|
||||||
@ -1248,7 +1248,7 @@ local function find()
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
GUI.error("Wrong searching regex", {title = {color = 0xFFDB40, text = "Warning"}})
|
GUI.error("Wrong searching regex")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -13,7 +13,7 @@ local GUI = require("GUI")
|
|||||||
|
|
||||||
----------------------------------------- cyka -----------------------------------------
|
----------------------------------------- cyka -----------------------------------------
|
||||||
|
|
||||||
if not component.isAvailable("printer3d") then GUI.error("This program requires at least one 3D-printer", {title = {color = 0xFFDB40, text = "Error"}}); return end
|
if not component.isAvailable("printer3d") then GUI.error("This program requires at least one 3D-printer"); return end
|
||||||
local args, options = require("shell").parse(...)
|
local args, options = require("shell").parse(...)
|
||||||
local startImagePath = args[1] == "open" and args[2] or "/MineOS/System/OS/Icons/Steve.pic"
|
local startImagePath = args[1] == "open" and args[2] or "/MineOS/System/OS/Icons/Steve.pic"
|
||||||
local configPath = "/MineOS/System/PrintImage/Config.cfg"
|
local configPath = "/MineOS/System/PrintImage/Config.cfg"
|
||||||
@ -203,10 +203,10 @@ local function createWindow()
|
|||||||
getStatus()
|
getStatus()
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
GUI.error("File \"" .. text .. "\" is not in .pic format", {title = {color = 0xFFDB40, text = "Error while loading image"}})
|
GUI.error("File \"" .. text .. "\" is not in .pic format")
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
GUI.error("File \"" .. text .. "\" doesn't exists", {title = {color = 0xFFDB40, text = "Error while loading image"}})
|
GUI.error("File \"" .. text .. "\" doesn't exists")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -7,7 +7,7 @@ local component = require("component")
|
|||||||
local unicode = require("unicode")
|
local unicode = require("unicode")
|
||||||
local MineOSCore = require("MineOSCore")
|
local MineOSCore = require("MineOSCore")
|
||||||
if not component.isAvailable("stargate") then
|
if not component.isAvailable("stargate") then
|
||||||
GUI.error("This program requires stargate from mod \"SGCraft\"", {title = {color = 0xFF8888, text = "Ошибка"}})
|
GUI.error("This program requires stargate from mod \"SGCraft\"")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local stargate = component.stargate
|
local stargate = component.stargate
|
||||||
@ -295,10 +295,11 @@ mainContainer.eventHandler = function(mainContainer, object, eventData)
|
|||||||
buffer.draw()
|
buffer.draw()
|
||||||
end
|
end
|
||||||
elseif eventData[1] == "sgMessageReceived" then
|
elseif eventData[1] == "sgMessageReceived" then
|
||||||
GUI.error(tostring(eventData[3]), {title = {color = 0xBBBBBB, text = "Incoming message"}, backgroundColor = 0x262626})
|
GUI.error(eventData[3])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
GUI.error()
|
||||||
loadContacts()
|
loadContacts()
|
||||||
updateContacts()
|
updateContacts()
|
||||||
update()
|
update()
|
||||||
|
|||||||
@ -248,7 +248,7 @@ local function tryToGetAndDrawWeather()
|
|||||||
--Сейвим погодку
|
--Сейвим погодку
|
||||||
saveWeatherData()
|
saveWeatherData()
|
||||||
else
|
else
|
||||||
GUI.error(jsonWeatherResponse, {title = {color = 0xFF8888, text = "Ошибка"}})
|
GUI.error(jsonWeatherResponse)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -889,6 +889,7 @@ function GUI.error(...)
|
|||||||
args[i] = tostring(args[i])
|
args[i] = tostring(args[i])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if #args == 0 then args[1] = "nil" end
|
||||||
|
|
||||||
local sign = image.fromString([[06030000FF 0000FF 00F7FF▟00F7FF▙0000FF 0000FF 0000FF 00F7FF▟F7FF00 F7FF00 00F7FF▙0000FF 00F7FF▟F7FF00CF7FF00yF7FF00kF7FF00a00F7FF▙]])
|
local sign = image.fromString([[06030000FF 0000FF 00F7FF▟00F7FF▙0000FF 0000FF 0000FF 00F7FF▟F7FF00 F7FF00 00F7FF▙0000FF 00F7FF▟F7FF00CF7FF00yF7FF00kF7FF00a00F7FF▙]])
|
||||||
local offset = 2
|
local offset = 2
|
||||||
|
|||||||
@ -599,7 +599,7 @@ function MineOSCore.safeLaunch(path, ...)
|
|||||||
finalSuccess, finalPath, finalLine, finalTraceback = false, path, tonumber(match) or 1, loadReason
|
finalSuccess, finalPath, finalLine, finalTraceback = false, path, tonumber(match) or 1, loadReason
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
GUI.error("Failed to safely launch file that doesn't exists: \"" .. path .. "\"", {title = {color = 0xFFDB40, text = "Warning"}})
|
GUI.error("Failed to safely launch file that doesn't exists: \"" .. path .. "\"")
|
||||||
end
|
end
|
||||||
|
|
||||||
component.screen.setPrecise(false)
|
component.screen.setPrecise(false)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user