Changes

Summary

1. port in everything from 1.6 but labotimizetools(will do that later this (details)

Commit 66a4ece284cbf4b7090b6d7e6f6036580c3fc89b by progwml6 port in everything from 1.6 but labotimizetools(will do that later this weekend)
	src/main/java/tconstruct/items/tools/Shortbow.java (diff)
	src/main/java/tconstruct/client/gui/ToolStationGui.java (diff)
	src/main/java/tconstruct/items/tools/Scythe.java (diff)
	neptunessrgconverter.py
	resources/assets/tinker/manuals/materials.xml (diff)
	src/main/java/tconstruct/library/tools/AbilityHelper.java (diff)
	src/main/java/tconstruct/library/tools/ToolCore.java (diff)
	src/main/java/tconstruct/library/tools/HarvestTool.java (diff)
	fields.csv
	src/main/java/tconstruct/common/TRecipes.java (diff)
	src/main/java/tconstruct/items/armor/HeartCanister.java (diff)
	src/main/java/tconstruct/items/tools/BowBase.java (diff)
	resources/assets/tinker/textures/gui/armorextended.png (diff)
	resources/assets/tinker/textures/items/canister_heart_yellow.png
	methods.csv
	resources/assets/tinker/lang/en_US.lang (diff)
	src/main/java/tconstruct/items/tools/Cleaver.java (diff)
	src/main/java/tconstruct/items/tools/Arrow.java (diff)
	src/main/java/tconstruct/items/StrangeFood.java (diff)
	src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java (diff)
	resources/assets/tinker/textures/items/food/bacon.png