Argh!
Damnit
Merge branch 'master' of https://github.com/sammko/QuantumCraft

Conflicts:
	MinecraftForge-Credits.txt
	MinecraftForge-License.txt
	Paulscode IBXM Library License.txt
	Paulscode SoundSystem CodecIBXM License.txt
	README-MinecraftForge.txt
	mcp/LICENSE.txt
	mcp/eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat
	mcp/eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	mcp/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	mcp/eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	mcp/eclipse/.metadata/.plugins/org.eclipse.jdt.core/286606776.index
	mcp/eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	mcp/eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	mcp/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	mcp/eclipse/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	mcp/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	mcp/eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	mcp/src/minecraft/sammko/quantumCraft/machine/TileEntityGenerator.java