Initial
Upgraded gradle
Added sandstone items and crafting for said items
More things and stuff and junk
More better things and stuff
More things and junk and stuff
It's none of your damn business what I do in my commits
This is also a thing
Removed armor
psh, who writes commit messages
Added cactus salve, and a few other things
Broke some things, fixed some things
Fixed salve, added cactus textures, cactus still needs a lot of work
Cleaned up
Merge commit '4f5585910c8a6b6ec7cd807acabc093892b110ff'

Conflicts:
	.gitignore