Adding ore generation
Adding ore generation
Merge branch 'master' of https://github.com/zbraden/Sonic-Intelligence

Conflicts:
	com/z4/sonicraft/Sonicraft.java
Merge branch 'master' of https://github.com/zbraden/Sonic-Intelligence
no message
no message
Merge branch 'master' of https://github.com/zbraden/Sonic-Intelligence

Conflicts:
	com/z4/sonicraft/Sonicraft.java