Fixed project file

Fixed project file
Ninja fix: colours

After the pre-release came out, instantly, a bug was found - colour on
InvisiGlass. This was caused by textures with black and alpha. Since
black contains no colour, the colour multiplier used in OpenGL had no
effect.
Updating for new release
Major feature additions

Many useful things added, such as the ability to craft the EnderStaff,
as well as an inventory resetter block , as well as future development
stubs.
Fixing merge conflicts

Fixing conflicts between merge versions

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
	LetsModReboot.iml
	LetsModReboot.ipr
	LetsModReboot.iws
	eclipse/logs/2014-09-10-1.log.gz
	eclipse/logs/2014-09-10-2.log.gz
	eclipse/logs/2014-09-10-3.log.gz
	eclipse/logs/2014-09-10-4.log.gz
	eclipse/logs/2014-09-10-5.log.gz
	eclipse/logs/2014-09-10-6.log.gz
	eclipse/logs/2014-09-10-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/saves/Test/DIM-1/data/villages.dat
	eclipse/saves/Test/DIM1/data/villages.dat
	eclipse/saves/Test/data/villages.dat
	eclipse/saves/Test/level.dat
	eclipse/saves/Test/level.dat_old
	eclipse/saves/Test/playerdata/040a63f0-e153-3f49-84a8-b60ca564e69f.dat
	eclipse/saves/Test/region/r.-1.-1.mca
	eclipse/saves/Test/region/r.-1.-2.mca
	eclipse/saves/Test/region/r.0.-1.mca
	eclipse/saves/Test/region/r.0.-2.mca
	eclipse/saves/Test/session.lock
	eclipse/saves/Test/stats/040a63f0-e153-3f49-84a8-b60ca564e69f.json
	src/main/resources/assets/letsmodreboot/textures/blocks/Thumbs.db
Merge branch 'master' of https://github.com/Crystalix007/LetsModReboot