Replace t_log with t_trunk.
Extract code for cutting logs into planks into a seperate method.
Add construction recipe for cutting tree trunk sections into planks in a single step.
Fix typo, thanks i2amroy.
Add CBM Chain Lightning and related ammo effects
Add new ammo effects to item factory
Lit torches set enemies on fire
Add flaming effect to wide technique attacks
Add check for water tiles in shockwave/knockback
check remaining momentum before calling plswim()
minor fix to scentmap, added more colors to scentmap
Added bionics.json
Made init_bionics() read from bionics.json
Updated code documentation for bionics

Why is the documentation stored both in DEVELOPER_FAQ.txt and in
EDITING? These two files should probably be consolidated.
butcher: preserve mtype on meat. iteminfo: "Smells like <original mobtype>", for
players with carnivore, or scentmap, or cheating bastards
FIX #560

Fixes #560
Drugs remove craving when used
Added advanced UPS that runs on plutonium at a rate of 1 plutonium per 500 charges. Doesn't allow the character to unload partially depleted plutonium and won't over fill the device if it can't fit a full plutonium. So no cheesing and no wasting materials :)
Merge CBM enhancements, butchering enhancements, drug craving abatement and flaming weapons.

Conflicts:
	bionics.cpp
Merge flaming weapons