NEI magics
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update
Minetweaker
Removed debug stuff
Fixed derp
Included MineTweaker

I don't know a better way of doing this, someone else fix it
Merge pull request #299 from way2muchnoise/1.7-update

update recipe to ignore recipes that uses the same item as the output
Merge pull request #300 from hilburn/minetweaker

Minetweaker update
Add color for fluid item.

Conflicts:
	src/main/java/minechem/fluid/FluidHelper.java
	src/main/java/minechem/proxy/ClientProxy.java
	src/main/java/minechem/proxy/CommonProxy.java
Merge pull request #301 from yushijinhun/fix-render

Add color for fluid item.