Not much.
Merge branch 'master' of https://github.com/Member1221/-Plus_Packs

Conflicts:
	.gradle/2.0/taskArtifacts/cache.properties.lock
	.gradle/2.0/taskArtifacts/fileHashes.bin
	.gradle/2.0/taskArtifacts/fileSnapshots.bin
	.gradle/2.0/taskArtifacts/taskArtifacts.bin
	.gradle/gradle.log
	bin/com/plusmods/oresplus/OresPlus.class
	eclipse/.metadata/.log
	eclipse/.metadata/.mylyn/.tasks.xml.zip
	eclipse/.metadata/.mylyn/tasks.xml.zip
	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/e4/b9/22/20/81/b5/eb/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/.projects/Minecraft/2.tree
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/10.tree
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.root/11.tree
	eclipse/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.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/savedIndexNames.txt
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/7.png
	eclipse/.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/8.png
	eclipse/.metadata/version.ini
	eclipse/logs/2014-12-28-1.log.gz
	eclipse/logs/2014-12-28-2.log.gz
	eclipse/logs/2014-12-28-3.log.gz
	eclipse/logs/2014-12-28-4.log.gz
	eclipse/logs/2014-12-28-5.log.gz
	eclipse/logs/2014-12-28-6.log.gz
	eclipse/logs/2014-12-28-7.log.gz
	eclipse/logs/fml-client-1.log
	eclipse/logs/fml-client-2.log
	eclipse/logs/fml-client-3.log
	eclipse/logs/fml-client-latest.log
	eclipse/logs/fml-junk-earlystartup.log
	eclipse/logs/latest.log
	eclipse/options.txt
	eclipse/saves/New World-----/DIM-1/data/villages.dat
	eclipse/saves/New World-----/DIM1/data/villages.dat
	eclipse/saves/New World-----/data/villages.dat
	eclipse/saves/New World-----/level.dat
	eclipse/saves/New World-----/level.dat_old
	eclipse/saves/New World-----/region/r.-1.-1.mca
	eclipse/saves/New World-----/region/r.-1.0.mca
	eclipse/saves/New World-----/session.lock
	eclipse/usernamecache.json
Fixed, broken fileTree
Merge branch 'master' of https://github.com/Member1221/-Plus_Packs
Merge branch 'master' of https://github.com/Member1221/-Plus_Packs