reorg app db

core/etc/apps/apps.db

@@ -1,17 +1,6 @@
 {
 --[[
 Needs work
-  [ "90ef98d4b6fd15466f0a1f212ec1db8d9ebe018c" ] = {
-    title = "Turtles",
-    category = "Apps",
-    icon = " \0305 \030c \0305 \030   \
-\030d \030c \0305 \030c \0308 \030d\031f\"\
- \0308\031f.\030 \031  \0308\031f.\030 \031   ",
-    iconExt = "\030 \031f\030f\031f\128\0305\135\030c\031c\128\128\0305\031f\139\0307\149\0308\0317\143\0307\128\
-\030 \031f\030c\031f\145\031c\128\030d\132\136\030c\128\0307\149\0318\143\133\
-\030 \031f\030f\031f\128\0317\143\031f\128\128\0317\143\031f\128\128\128",
-    run = "Turtles.lua",
-  },
   [ "381e3298b2b8f6caeb2208b57d805ada38402f0b" ] = {
     title = "Scripts",
     category = "Apps",
@@ -46,6 +35,17 @@ Needs work
 \030 \031  \030f\0317\130\030 \031  \030f\0317\130",
     run = "Appstore.lua",
   },
+  [ "90ef98d4b6fd15466f0a1f212ec1db8d9ebe018c" ] = {
+    title = "Turtles",
+    category = "Apps",
+    icon = " \0305 \030c \0305 \030   \
+\030d \030c \0305 \030c \0308 \030d\031f\"\
+ \0308\031f.\030 \031  \0308\031f.\030 \031   ",
+    iconExt = "\030 \031f\030f\031f\128\0305\135\030c\031c\128\128\0305\031f\139\0307\149\0308\0317\143\0307\128\
+\030 \031f\030c\031f\145\031c\128\030d\132\136\030c\128\0307\149\0318\143\133\
+\030 \031f\030f\031f\128\0317\143\031f\128\128\0317\143\031f\128\128\128",
+    run = "Turtles.lua",
+  },
 --[[
   [ "131260cbfbb0c821f8eae5e7c3c296c7aa4d50b9" ] = {
     title = "Music",
@@ -57,22 +57,6 @@ Needs work
     run = "usr/apps/Music.lua",
     requires = 'turtle',
   },
-  [ "89307d419a2fe4fbb69af92b3d3af27b6ec14d3e" ] = {
-    title = "Telnet",
-    category = "Apps",
-    icon = "    \0314>\0310_\
- \031f)))\031   \
-\0314>\0310_\031     ",
-    run = "telnet.lua",
-  },
-  [ "8a77613b475e46064321fd7da18d126ee35e5066" ] = {
-    title = "VNC",
-    category = "Apps",
-    icon = "\
-\031e\\\031   \031e/\031dn\
- \031e\\/\031  \0319c",
-    run = "vnc.lua",
-  },
   [ "131f0b008f44298812221d120d982940609be781" ] = {
     title = "Builder",
     category = "Apps",

farms/farmer.lua

@@ -203,7 +203,7 @@ local s, m = turtle.run(function()
   local facing = scanner.getBlockMeta(0, 0, 0).state.facing
   turtle.point.heading = Point.facings[facing].heading
 
-  turtle.setStatus(string.format('Farming (fuel: %s)', Util.toBytes(turtle.getFuelLevel())))
+  turtle.setStatus('farming')
   print('Fuel: ' .. turtle.getFuelLevel())
 
   turtle.setMovementStrategy('goto')

farms/help/farmer

@@ -0,0 +1,47 @@
+An efficient crop farmer. The turtle will harvest and replant the same crop in it's place.
+
+The turtle will NOT refuel itself. You can use the lavaRefuel program (core package) to fuel the turtle as needed.
+
+Requirements
+============
+ * Turtle (advanced recommended)
+ * Diamond Pickaxe
+ * Block Scanner
+ * Vanilla Chest
+
+Setup
+=====
+> pastebin run uzghlbnc
+> package install farms
+> reboot
+
+Prepare the area to be farmed by planting crops on a level area (with a few exceptions - see crop list below). The farm can be any size.
+
+Place a vanilla chest (or several) around the farm for the turtle to drop items into.
+
+Place the turtle 1 level above the crops. The turtle will harvest crops immediately below.
+
+Place into the turtle the block scanner and diamond pickaxe. Add in some of the items used for replanting.
+
+To start the program, run:
+
+> farmer
+
+A startup file is created automatically the first time the program is run (usr/autorun/farmer.lua).
+
+Crop List
+=========
+ * Wheat
+ * Carrots
+ * Potatoes
+ * Beetroots
+ * Nether wart
+ * Reeds
+ * Melon
+ * Pumpkin
+ * Cactus: Plant 1 level below the other crops
+ * Cocoa beans: The cocoa beans must be at the same level as the turtle. Recommended to plant at the edge of the farm.
+
+Configuration
+=============
+After the program is run initially, a configuration file is created (usr/config/farmer). This file can be edited to add custom plants or upgrade the vanilla chest to a larger chest (from a mod). If any changes are made, the program will need to be restarted.

neural/apis/neural/mobs.lua

@@ -1,12 +1,13 @@
 local Mobs = { }
 
 local hostiles = {
-  ancient_golem = true,
   BabySkeleton = true,
   BabyZombie = true,
   Bat = true,
   Creeper = true,
   Husk = true,
+  LavaSlime = true,
+  PigZombie = true,
   Skeleton = true,
   Slime = true,
   Spider = true,
@@ -16,7 +17,7 @@ local hostiles = {
 }
 
 function Mobs.getNames()
-	return hostiles
+  return hostiles
 end
 
 return Mobs