Merge branch '1.6.4'
Merge branch '1.6.4'
Updated to the newest Forge version
Updated to the new download format.

They are using maven? Maybe that has something to do with this new
Gradle thingy, Maybe I will update the modding env. to Gradle. Maybe.
Every module has now 2 IDs.

One for 1x1x1 cubes and another for blocks with custom models
Renamed the blocks for the new system.
Made two new supper classes for normal and model blocks
Merge branch 'master' into 1.6.4

Conflicts:
	common/industrialscience/blocksystem/ISModuleBlock.java
	common/industrialscience/modules/ResearchModule.java
	common/industrialscience/modules/fishing/FishingModuleNormalBlock.java