Updated TileEntities to 1.7, minus NBT and Packets
Merge remote-tracking branch 'origin/1.7' into 1.7

Conflicts:
	src/main/java/vazkii/tinkerer/common/block/tile/TileAspectAnalyzer.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileCamo.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileEnchanter.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileFunnel.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileRepairer.java
Updated TileEntities to 1.7

Merge remote-tracking branch 'origin/1.7' into 1.7

Conflicts:
	src/main/java/vazkii/tinkerer/common/block/tile/TileAspectAnalyzer.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileCamo.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileEnchanter.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileFunnel.java
	src/main/java/vazkii/tinkerer/common/block/tile/TileRepairer.java