require overhaul part 2

builder/base64dl.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Base64 = require('base64')
 
 local http  = _G.http

builder/builder.lua

@@ -2,8 +2,6 @@ if not _G.turtle and not _G.commands then
   error('Must be run on a turtle or a command computer')
 end
 
-_G.requireInjector()
-
 local Adapter   = require('inventoryAdapter')
 local Event     = require('event')
 local GPS       = require('gps')

builder/supplier.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Event      = require('event')
 local Logger     = require('logger')
 local MEProvider = require('meProvider')

core/Appstore.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Ansi   = require('ansi')
 local SHA1   = require('sha1')
 local UI     = require('ui')

core/Events.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Event = require('event')
 local UI    = require('ui')
 local Util  = require('util')

core/Music.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Event = require('event')
 local UI    = require('ui')
 

core/Script.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Config = require('config')
 local Event  = require('event')
 local Socket = require('socket')

core/Turtles.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Config   = require('config')
 local Event    = require('event')
 local itemDB   = require('itemDB')

core/recorder.lua

@@ -14,8 +14,6 @@ local version = "Version 1.1.6"
 -- Original code by Bomb Bloke
 -- Modified to integrate with opus os
 
-_G.requireInjector()
-
 local Util = require('util')
 
 local multishell = _ENV.multishell

core/shapes.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local GPS    = require('gps')
 local Socket = require('socket')
 local UI     = require('ui')

farms/help/superTreefarm

@@ -0,0 +1,35 @@
+An advanced tree farming program for use when you have gathered enough resources to fulfill the requirements (see the treefarm program for a day 1 tree farming program).
+
+The turtle will refuel itself from charcoal that it will make from the logs gathered (no fuel is required initially).
+
+Requirements
+============
+* Advanced Turtle
+* Diamond Pickaxe
+* Standard Modem
+* Block Scanner
+* Entity Sensor
+* Crafting Table
+* Vanilla Chest
+* GPS
+
+Setup
+=====
+> pastebin run uzghlbnc
+> package install farms
+> reboot
+
+The tree farm fits exactly in one chunk. It's best to have a mostly level ground around the center of the farming area as the turtle will only collect saplings that have fallen to the same level as the turtle.
+
+To align the turtle perfectly in one chunk, position the turtle 8 blocks diagonally from the bottom left corner.
+
+Place a sapling directly in front of the turtle and place all the required items into the inventory.
+
+To start the program, run:
+
+> superTreefarm
+A startup file is created automatically the first time the program is run (usr/autorun/superTreefarm.lua).
+
+Tips
+====
+At any time, you can add additional saplings into the turtle's inventory. The modem is only needed for GPS. Wireless network can be disabled via System->Networking.

miners/simpleMiner.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Pathing = require('turtle.pathfind')
 local Point   = require('point')
 local Util    = require('util')

monitor/mirror.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Terminal = require('terminal')
 local Util     = require('util')
 

monitor/mirrorClient.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Event    = require('event')
 local Logger   = require('logger')
 local Socket   = require('socket')

monitor/mirrorHost.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Event  = require('event')
 local Logger = require('logger')
 local Socket = require('socket')

neural/etc/apps/neural-apps.db

@@ -19,9 +19,14 @@
     category = "Neural",
     run = "neuralRemote.lua",
   },
-  [ "Entities" ] = {
-    title = "Entities",
+  [ "Sensor" ] = {
+    title = "Sensor",
     category = "Neural",
     run = "Entities.lua",
   },
+  [ "Scanner" ] = {
+    title = "Scanner",
+    category = "Neural",
+    run = "Scanner.lua",
+  },
 }

neural/neuralFight.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Angle = require('neural.angle')
 local GPS   = require('gps')
 local Mobs  = require('neural.mobs')

neural/robotWars.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Angle = require('neural.angle')
 local ni    = require('neural.interface')
 local Util  = require('util')

pickup/pickup.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local Event        = require('event')
 local ChestAdapter = require('chestAdapter18')
 local Point        = require('point')

storage/Crafter.lua

@@ -24,8 +24,6 @@
    MMMMMM
 ]]--
 
-_G.requireInjector()
-
 local InventoryAdapter = require('inventoryAdapter')
 local Config         = require('config')
 local Event          = require('event')

storage/chestManager.lua

@@ -80,8 +80,6 @@
                      name/monitor_1 - specify the exact name of the peripheral
 ]]--
 
-_G.requireInjector()
-
 local Ansi           = require('ansi')
 local Config         = require('config')
 local Craft          = require('turtle.craft')

storage/levelEmitter.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local InventoryAdapter = require('inventoryAdapter')
 local Config         = require('config')
 local Event          = require('event')

storage/storageActivity.lua

@@ -1,5 +1,3 @@
-_G.requireInjector()
-
 local InventoryAdapter = require('inventoryAdapter')
 local Event            = require('event')
 local UI               = require('ui')