Fixed firstaid and bandages.
Add weak block to makeshift machete and broadsword
Added weak block to nailbats, forgot to include it when adding them
Added block to a few more items. Steel spear is named knife spear, is
crafted with a spike rather than a knife. Steak knives can now be
disassembled '(' for a spike.
Fixed read time being displayed when selecting perception. Normalized
amount of flammable stuff required for a molotov
Fixed error with blades in knife spears. Also added meat soup
Windows redraw fixes.
Npc training talk fix

Conflicts:
	npctalk.cpp
Updated credits
Sinks no longer count as water sources
Craftable rock pots

Conflicts:
	itype.h
	itypedef.cpp
Zombies bash curtained windows, waterskins craftable. Text overlap on
stats probably fixed.

Conflicts:
	crafting.cpp
Fixed duplicate bashable flag
Fix
Fixed an error in waterskin crafting, Reworked some skill costs

Conflicts:
	crafting.cpp
something
Drugdeal generation freeze fix
Change (hot) to (fresh) on newly generated items.

Conflicts:
	crafting.cpp
Moved templates back to data folder.
Having them in the save folder prevented some problems with carrying
over to new versions yes, but it was also incredibly annoying to use
templates if you also wanted to use the 'delete world on save' option.
Added a changelog