Fix typo.
Merge syntax fix making fur-lined items only require fur or other material instead of both.
Fix the fur crafting fix. Right idea, wrong direction.
Initialize lastrecipe so it won't segfault if you trigger it without crafting something first. Thanks Nickboom for reporting.
Adds total damage taken/healed to memorial file
Fix a bunch of warnings with item.h

Fixes #3189
Fix the narrowing warnings that were appearing on windows tiles builds
Fixed overkill damage count removal
Merge remote branch 'origin/master' into veh-interact-pr

fixed Conflicts:
	pldata.h
	veh_interact.cpp
	veh_type.h
	veh_typedef.cpp
	vehicle.cpp
str vpart.id: Rewrite save/load code to new json save/load & legacy sstream loader, using autogenerated legacy_vpart_id vector where needed.
Merge RPG-7, distance-from-collision-vpart-damage-cushion(tm), file_finder, misc warning/segv fixes
remote branches 'origin/pr/3109', 'origin/pr/3134', 'origin/pr/3133', 'origin/pr/3202' and 'origin/pr/3204'
Merge damage taken/healed stats
remote branch 'origin/pr/3203'
RFI: Take a perfectly good fusion emitter, and make a rifle out of it. Keep both arms.
Rename "first aid" item to "first aid kit".
Properly pass item->name to use_healing_item().
Properly adds integrated toolset to candlestick un-crafting recipe.
Merge pull request #1 from atomicdryad/veh-interact-pr

Merge to latest, rewrite save/load code to new json save/load & legacy sstream loader, using autogenerated legacy_vpart_id vector where needed.
Fix tiles to use the new map of vehicle part types.
Changes item_group 'kevlar_patch' to proper 'kevlar_plate' listing.
Merge elimination of vpart_id enum, completing full jsonization of vparts. And player_activity.str_value
remote branch 'origin/pr/3173'