Adds WBLOCK_2 to more weaponry in tools.json

Also tweaked the formatting a bit and added WBLOCK_1 to some axes
Merge remote-tracking branch 'Izicata/patch-5' into FrankenMod

Conflicts:
	data/json/items/tools.json
Adds WBLOCK_2 to more weaponry in melee.json 

Also added WBLOCK_1 to golf club and hockey stick, and made the fake nodachi's techniques match the real nodachi's techniques.

Fixed some of the indenting but stopped caring halfway through.
Minor formatting fix
Add Wishbringer's sanity check and formatting fix
Merge remote-tracking branch 'Izicata/patch-5' into FrankenMod

Conflicts:
	data/json/items/melee.json
	src/melee.cpp
JSON fixes.