From 8d1acbbd7cb8dc3a037c6540a27505fef62b024e Mon Sep 17 00:00:00 2001
From: kepler155c <kepler155c@gmail.com>
Date: Sun, 24 Sep 2017 18:54:35 -0400
Subject: [PATCH] cleanup

---
 apps/{monitorManager.lua => mwm.lua} | 10 ++++++++--
 apps/webapp.lua                      |  4 ++--
 etc/recipes.db                       |  9 +++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)
 rename apps/{monitorManager.lua => mwm.lua} (98%)

diff --git a/apps/monitorManager.lua b/apps/mwm.lua
similarity index 98%
rename from apps/monitorManager.lua
rename to apps/mwm.lua
index e355cd7..bb6b770 100644
--- a/apps/monitorManager.lua
+++ b/apps/mwm.lua
@@ -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()
diff --git a/apps/webapp.lua b/apps/webapp.lua
index 883de3f..5a5c8ef 100644
--- a/apps/webapp.lua
+++ b/apps/webapp.lua
@@ -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)
diff --git a/etc/recipes.db b/etc/recipes.db
index 8c61497..3019fdc 100644
--- a/etc/recipes.db
+++ b/etc/recipes.db
@@ -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 = {