Basic Blocks can be disabled...

…by setting IDs to 0.
Derp
Some work on the steam Coal Generator.
Tweaks to the Vanity GUI

Left most slots are for main clothing items, such as jackets, etc
The ones to the right of them are for misc items, such as hats, and
cloaks

The slots are a little bit out of whack, sorry.
Merge pull request #45 from warlordjones/master

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

Whoops!!
Fixed my derp.

Ty Decabal.
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 #49 from BrassGoggledCoders/nightly

Nightly into Master
Merge pull request #1 from BrassGoggledCoders/master

Updates for moi
Cleared out this junk

Yay!
Updated .gitignore, began adding new src

Lots and lots of cleanup
Updated README
Moar updates
Moar & moar