From a17677730f7d54580a58ed60a719d37ca2691213 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Wed, 21 Mar 2018 13:42:29 -0400 Subject: [PATCH] 1.7.10 compatibility --- sys/apps/Installer.lua | 4 ++-- sys/boot/opus.boot | 2 +- sys/extensions/6.tl3.lua | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/apps/Installer.lua b/sys/apps/Installer.lua index 0f88210..da576a5 100644 --- a/sys/apps/Installer.lua +++ b/sys/apps/Installer.lua @@ -6,8 +6,8 @@ local os = _G.os local injector if not install.testing then - _G.OPUS_BRANCH = 'develop-1.8' - local url ='https://raw.githubusercontent.com/kepler155c/opus/develop-1.8/sys/apis/injector.lua' + _G.OPUS_BRANCH = 'master-1.8' + local url ='https://raw.githubusercontent.com/kepler155c/opus/master-1.8/sys/apis/injector.lua' injector = load(http.get(url).readAll(), 'injector.lua', nil, _ENV)() else injector = _G.requireInjector diff --git a/sys/boot/opus.boot b/sys/boot/opus.boot index 32c7010..ef0e8ed 100644 --- a/sys/boot/opus.boot +++ b/sys/boot/opus.boot @@ -2,7 +2,7 @@ local fs = _G.fs local http = _G.http -_G.OPUS_BRANCH = 'develop-1.8' +_G.OPUS_BRANCH = 'master-1.8' local GIT_REPO = 'kepler155c/opus/' .. _G.OPUS_BRANCH local BASE = 'https://raw.githubusercontent.com/' .. GIT_REPO diff --git a/sys/extensions/6.tl3.lua b/sys/extensions/6.tl3.lua index 4c0e763..aab51e2 100644 --- a/sys/extensions/6.tl3.lua +++ b/sys/extensions/6.tl3.lua @@ -129,6 +129,13 @@ function turtle.getHeadingInfo(heading) return headings[heading] end +-- hackish way to support unlimited fuel +if type(turtle.getFuelLevel()) ~= 'number' then + function turtle.getFuelLevel() + return 10000000 + end +end + -- [[ Basic turtle actions ]] -- local function inventoryAction(fn, name, qty) local slots = turtle.getFilledSlots()