minecraft 1.7.9
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/com/stider/riftcraft/Riftcraft.java
	common/com/stider/riftcraft/block/BlockMiniblackhole.java
	common/com/stider/riftcraft/block/BlockWarpedBlock.java
	common/com/stider/riftcraft/block/Blockfurnace.java
	common/com/stider/riftcraft/block/ModBlocks.java
	common/com/stider/riftcraft/client/Gui/GuiFurnace.java
	common/com/stider/riftcraft/client/render/RenderFurnace.java
	common/com/stider/riftcraft/core/proxy/ClientProxy.java
	common/com/stider/riftcraft/core/proxy/CommonProxy.java
	common/com/stider/riftcraft/item/ModItems.java
	common/com/stider/riftcraft/lib/Models.java
	common/com/stider/riftcraft/lib/Strings.java
	common/com/stider/riftcraft/lib/Textures.java
	common/com/stider/riftcraft/tile/TileEntityFurnace.java
	rescources/assets/Riftcraft/lang/en_US.lang