Suppression de .gradle (inutile)
Merge branch 'master' of https://github.com/Vayper/MorePowerCraft

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.gradle/gradle.log
	build.gradle