Item: memory stone fix
Merge branch 'master' of https://github.com/testmad/GaiaMod

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.gradle/gradle.log
	.settings/org.eclipse.jdt.core.prefs
	eclipse/.metadata/.log

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/b0/52/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/org.eclipse.jdt.core/state.dat

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/3.tree

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.snap

	eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	eclipse/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/286606776.index
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

	eclipse/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	eclipse/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	eclipse/.metadata/version.ini
	eclipse/logs/fml-client-latest.log
	eclipse/logs/fml-junk-earlystartup.log
	eclipse/logs/latest.log