latest commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/gtr/progressionplus/common/ModItems.java
	src/main/resources/assets/progressionplus/lang/en_US.lang

	src/main/resources/assets/progressionplus/textures/items/chunk_meteorite.png
last commit
commit
fixed commit

Conflicts:
	src/main/java/gtr/progressionplus/common/ModItems.java
	src/main/resources/assets/progressionplus/lang/en_US.lang

	src/main/resources/assets/progressionplus/textures/items/ore_meteorite.png