Merge branch 'master' into autolabor

develop
Kelly Martin 2012-11-30 21:47:30 -06:00
commit d2ec52fa0b
2 changed files with 2 additions and 2 deletions

@ -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
}