Un-Nerf Various Tool Recipes

Because needing multiple tools, some metal plates, an ingot or two, and
sticks just to make a metal pickaxe is a bit much...  3 ingots and 2
sticks is good enough.
Un-Nerf More Recipes

Mostly for consistency, also for unnecessary tedium.
Merge branch 'master' of https://github.com/Nincraft/NincraftElectricBoogaloo2RevengeoftheFallen