Merge pull request #40 from BrassGoggledCoders/master

Master into Nightly
Merge pull request #42 from warlordjones/master

Vanity GUI :D
Merge pull request #43 from warlordjones/master

Interfaces for other slots
Merge pull request #44 from warlordjones/master

Autoformat
Some work on the steam Coal Generator.
Merge pull request #45 from warlordjones/master

Tweak the Vanity GUI
Merge pull request #46 from warlordjones/master

Whoops!!
Fully functional Steam Boiler.

Work on canisters and some cleanup.
Fixed GUI render.
Merge pull request #47 from decebaldecebal/master

Finished work on Steam Boiler
Merge pull request #48 from warlordjones/master

Fixed my derp.
Merge branch 'refs/heads/master' into nightly

Signed-off-by: Arona Jones <warlordjones@gmail.com>

Conflicts:
	common/steamcraft/client/core/handler/GuiHandler.java
	common/steamcraft/client/gui/GuiCoalGenerator.java
	common/steamcraft/common/block/ModBlocks.java
	common/steamcraft/common/block/tile/TileEntityBasicSteamBoiler.java
	common/steamcraft/common/block/tile/TileEntityCoalGenerator.java
	common/steamcraft/common/block/tile/container/ContainerCoalGenerator.java
	common/steamcraft/common/item/ItemElectricMod.java
Merge pull request #1 from BrassGoggledCoders/nightly

Update my Fork