Tweaking files here and there
Fixed tile entities and did some general work
A few minor tweaks
Merge remote-tracking branch 'origin/master'

Conflicts:
	eclipse/.metadata/.log

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

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/46/1a/13/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/46/1a/9f/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/46/1a/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/46/9f/6c/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/46/9f/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/26/a/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/3b/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/6a/13/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/6a/1d/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/6a/ae/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/6d/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/b3/f3/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/b3/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/c0/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/d2/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/e5/f6/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/e5/f8/history.index

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

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/15/f4/history.index

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

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/1d/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/3b/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/7a/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/7c/13/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/7c/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/85/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/c0/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/e5/9f/history.index

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

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/f8/85/94/5f/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/f8/85/b3/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/e4/b9/22/f8/9f/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.indexes/history.index

	eclipse/.metadata/.plugins/org.eclipse.core.resources/.projects/Minecraft/.location

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

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

	eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/Client.launch
	eclipse/.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml

	eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	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/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/QualifiedTypeNameHistory.xml
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

	eclipse/.metadata/.plugins/org.eclipse.ltk.ui.refactoring/dialog_settings.xml
	eclipse/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log

	eclipse/.metadata/.plugins/org.eclipse.recommenders.completion.rcp.calls/call-models-0.5.json

	eclipse/.metadata/.plugins/org.eclipse.recommenders.rcp/v0.5-package-root-infos.json

	eclipse/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	eclipse/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	eclipse/logs/fml-client-latest.log
	eclipse/logs/fml-junk-earlystartup.log
	eclipse/logs/latest.log