Revert "s"

This reverts commit 15da878f7761b4d4d6403b49a482cfbaa9a9e9c8.

Conflicts:

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.markers.snap

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.syncinfo.snap

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/ec/81/c1/60/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.markers.snap

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.syncinfo.snap

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

	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.e4.workbench/workbench.xmi
	eclipse/.metadata/.plugins/org.eclipse.jdt.core/286606776.index

Merge remote-tracking branch
'origin/master'

Conflicts:

	Magicnation/com/juanwan11_magicnation/structures/WorldGenStarterStructure.java

Revert "s"

This reverts commit
19f93eaf2b67c904e8a6edd133023b95a33829d1.