Added iflesh butcher case. To fix the ant larva creating tainted flesh bug.
Merge remote-tracking branch 'Soyweiser/Ants_veggie'
refactor item::is_funnel_container

Use unsigned int as parameter, because it is compared against it_container::contains which is an unsigned int, too.
Return boolean and make the comparison in the function directly instead of after calling. At the same time update the maxcontains value.

And of course check for watertight container to fix #6411
Merge remote-tracking branch 'BevapDin/funnelllllls'
Merge pull request #6399 from Rivet-the-Zombie/logic-fix

Logic fix for fire damage check.
Merge remote-tracking branch 'origin/master'