This commit is contained in:
kepler155c
2017-09-24 18:54:35 -04:00
parent 05166c1fd3
commit 8d1acbbd7c
3 changed files with 19 additions and 4 deletions

View File

@@ -5,7 +5,7 @@ local Util = require('util')
local function syntax()
printError('Syntax:')
print('monitorManager [session file] [monitor]')
print('mwm sessionName [monitor]')
error()
end
@@ -14,8 +14,14 @@ local UID = 0
local processes = { }
local parentTerm = term.current()
local configFile = args[1] or syntax()
local monitor = peripheral.find(args[2] or 'monitor') or syntax()
local defaultEnv = Util.shallowCopy(getfenv(1))
local monitor
if args[2] then
monitor = peripheral.wrap(args[2]) or syntax()
else
monitor = peripheral.find('monitor') or syntax()
end
monitor.setTextScale(.5)
monitor.clear()

View File

@@ -1,5 +1,5 @@
local args = { ... }
local GIT_REPO = 'kepler155c/opus/develop'
local GIT_REPO = 'kepler155c/opus/master'
local BASE = 'https://raw.githubusercontent.com/' .. GIT_REPO
local function dourl(env, url)
@@ -32,7 +32,7 @@ local s, m = pcall(function()
-- install filesystem
fs.mount('', 'gitfs', GIT_REPO)
fs.mount('usr', 'gitfs', 'kepler155c/opus-apps/develop')
fs.mount('usr', 'gitfs', 'kepler155c/opus-apps/master')
-- start program
local file = table.remove(args, 1)

View File

@@ -1159,6 +1159,15 @@
[ 7 ] = "minecraft:iron_ingot:0",
},
},
[ "minecraft:stone:2" ] = {
count = 4,
ingredients = {
"minecraft:stone:1",
"minecraft:stone:1",
[ 5 ] = "minecraft:stone:1",
[ 6 ] = "minecraft:stone:1",
},
},
[ "minecraft:gold_block:0" ] = {
count = 63,
ingredients = {