Work in progress. A few blocks broken. Ugly ass giant switch statements. HELLO, this is how I roll
Merge branch 'master' of github.com:OpenMods/OpenBlocks

Conflicts:
	src/openblocks/common/block/OpenBlock.java
	src/openblocks/common/tileentity/SyncedTileEntity.java
	src/openblocks/common/tileentity/TileEntityCannon.java
	src/openblocks/common/tileentity/TileEntityFan.java
	src/openblocks/common/tileentity/TileEntityTarget.java