diff --git a/.DS_Store b/.DS_Store index d77f903a..dc57a8ab 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index b2bee09a..e32c20d6 100644 --- a/Applications.txt +++ b/Applications.txt @@ -292,7 +292,7 @@ url="IgorTimofeev/OpenComputers/master/lib/ECSAPI.lua", type="Library", preLoadFile=true, - version=1.06, + version=1.07, }, { name="lib/colorlib.lua", @@ -314,12 +314,6 @@ type="Library", version=1.05, }, - { - name="lib/internet.lua", - url="IgorTimofeev/OpenComputers/master/lib/internet.lua", - type="Library", - version=1.01, - }, { name="lib/GUI.lua", url="IgorTimofeev/OpenComputers/master/lib/GUI.lua", @@ -475,20 +469,6 @@ forceDownload=true, version=1.0, }, - { - name="bin/wget.lua", - url="IgorTimofeev/OpenComputers/master/Applications/wget.lua", - type="Script", - forceDownload=true, - version=1.01, - }, - { - name="bin/pastebin.lua", - url="IgorTimofeev/OpenComputers/master/Applications/pastebin.lua", - type="Script", - forceDownload=true, - version=1.01, - }, { name="bin/clear.lua", url="IgorTimofeev/OpenComputers/master/Applications/clear.lua", @@ -624,7 +604,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/VK/Icon.pic", createShortcut="dock", - version=1.23, + version=1.24, resources={ { name="VKLogo.pic", @@ -639,7 +619,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/Weather/Icon.pic", createShortcut="desktop", - version=1.11, + version=1.12, resources={ { name="Cloudy.pic", diff --git a/Applications/.DS_Store b/Applications/.DS_Store index 3489783d..3eb96767 100644 Binary files a/Applications/.DS_Store and b/Applications/.DS_Store differ diff --git a/Applications/VK/.DS_Store b/Applications/VK/.DS_Store index 8de1fd0d..101570ba 100644 Binary files a/Applications/VK/.DS_Store and b/Applications/VK/.DS_Store differ diff --git a/Applications/VK/VK.lua b/Applications/VK/VK.lua index 3f1dd932..83019009 100755 --- a/Applications/VK/VK.lua +++ b/Applications/VK/VK.lua @@ -6,7 +6,6 @@ local json = require("json") local serialization = require("serialization") local event = require("event") local ecs = require("ECSAPI") -local internet = require("internet") local fs = require("filesystem") local buffer = require("doubleBuffering") local context = require("context") @@ -143,7 +142,7 @@ end --Банальный URL-запрос, декодирующийся через ЖУСОН в случае успеха, епты local function request(url) - local success, response = internet.request(url) + local success, response = ecs.internetRequest(url) if success then response = json:decode(response) end return success, response end diff --git a/Applications/Weather/.DS_Store b/Applications/Weather/.DS_Store index 485f8040..d9e02563 100644 Binary files a/Applications/Weather/.DS_Store and b/Applications/Weather/.DS_Store differ diff --git a/Applications/Weather/Weather.lua b/Applications/Weather/Weather.lua index 3fee97fc..b3bf03d5 100755 --- a/Applications/Weather/Weather.lua +++ b/Applications/Weather/Weather.lua @@ -13,7 +13,6 @@ local image = require("image") local unicode = require("unicode") local component = require("component") local GUI = require("GUI") -local internet = require("internet") ---------------------------------------------------- Константы ---------------------------------------------------------------- @@ -88,7 +87,7 @@ local weatherIcons = { --Запрос на получение погоды local function weatherRequest(city) local url = "https://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20weather.forecast%20where%20woeid%20in%20(select%20woeid%20from%20geo.places(1)%20where%20text%3D%22" .. city .. "%2C%20ak%22)&format=json&env=store%3A%2F%2Fdatatables.org%2Falltableswithkeys" - local success, response = internet.request(url) + local success, response = ecs.internetRequest(url) if success then response = json:decode(response)