#1.0
#1.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/tool/Tool.java
	src/main/java/tool/material/DenseVeldspar.java
	src/main/java/tool/material/MassiveVeldspar.java
	src/main/java/tool/material/Ore.java
	src/main/java/tool/material/Veldspar.java
	target/classes/META-INF/MANIFEST.MF
	target/classes/META-INF/maven/Isfirs/EVE-Tool/pom.properties
	target/classes/tool/Tool.class
	target/classes/tool/material/DenseVeldspar.class
	target/classes/tool/material/MassiveVeldspar.class
	target/classes/tool/material/Ore.class
	target/classes/tool/material/Veldspar.class