Fix #236: Crops multifarm putting dirt in the output inventory

dirt was listed as a waste product, as a holdover from the older style farms
Fix #240: Cans cannot pick up water or lava
Merge branch 'dev' into release_3.1