Update Awakened Ichorium pickaxe #234
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/assets/ttinkerer/lang/en_US.lang
Merge