Changed rock to ore
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/assets/progressionplus/lang/en_US.lang
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 739414e4cde5089511fed2467f8d64c924f7ea19.