Merge branch 'master' into autolabor

plugins/lua/workflow.lua

@@ -8,7 +8,7 @@ local utils = require 'utils'
 
  * isEnabled()
  * setEnabled(enable)
- * listConstraints([job[,with_history]]) -> {{...},...}
+ * listConstraints([job[,with_history] ]) -> {{...},...}
  * findConstraint(token) -> {...} or nil
  * setConstraint(token[, by_count, goal, gap]) -> {...}
  * deleteConstraint(token) -> true/false

scripts/autofarm.rb

@@ -35,7 +35,7 @@ class AutoFarm
 			if (!i.flags.dump && !i.flags.forbid && !i.flags.garbage_collect &&
 				!i.flags.hostile && !i.flags.on_fire && !i.flags.rotten &&
 				!i.flags.trader && !i.flags.in_building && !i.flags.construction &&
-				!i.flags.artifact1 && plantable.has_key? (i.mat_index))
+				!i.flags.artifact)
 				counts[i.mat_index] = counts[i.mat_index] + i.stack_size
 			end
 		}