added new material images
added new materials
added simple recipes
removed unnecessary files
Merge branch 'master' into adding_new_materials

Conflicts:
	src/items/materials/leafItem.lua
	src/items/materials/rockItem.lua
	src/items/materials/stickItem.lua
	src/items/recipes.lua
Merge branch 'master' into adding_new_materials_merge

Conflicts:
	src/items/recipes.lua
Merge branch 'master' into adding_new_materials_merge
Merge branch 'master' into adding_new_materials

Conflicts:
	src/datastore.lua
fixed tree trunk
matches the bounding box closer to the actual position in all wielding frames
extended waterfall
fixed duplicate of attack box
fixed flyin bug
Merge pull request #990 from prene7/treeline_fix

fixed tree trunk
Merge pull request #994 from prene7/villageforest

extended waterfall
you no longer need to be still to interact
uses interact to interact with items
adds drag to blocks to allow for ice or "sticky" blocks
NimbusBp1729 was right
Merge pull request #1012 from NimbusBP1729/fixed_double_attack_box

fixed duplicate of attack box