Modularize the localizations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/mod/badores/ore/OreManager.java
More localizations, fix merge errors
Merge remote-tracking branch 'origin/master'
fix armor localization