Uhhh...
Merge pull request #15 from MrArcane111/master

Bleeding edge updates
Updated README
Merge pull request #16 from MrArcane111/master

Updated README
Merge pull request #1 from BrassGoggledCoders/nightly

Nightly
Began work on a Guide Book for SC2
Merge pull request #21 from decebaldecebal/master

Work on integration between power systems.
Yeah, more book crap
Merge pull request #24 from MrArcane111/master

Added SC2 Guide Stuff
Switched to a .lang file
Merge pull request #25 from warlordjones/master

Switched to a .lang file
Merge remote-tracking branch 'upstream/nightly'

Conflicts:
	assets/steamcraft/lang/en_US.lang
	common/steamcraft/mod/client/core/handler/GuiHandler.java
	common/steamcraft/mod/common/block/ModBlocks.java
	common/steamcraft/mod/common/block/ModOres.java
	common/steamcraft/mod/common/block/ModPowerBlocks.java
	common/steamcraft/mod/common/block/machines/BlockCompressor.java
	common/steamcraft/mod/common/block/machines/ModMachines.java
	common/steamcraft/mod/common/block/tile/TileEntityChemicalFurnace.java
	common/steamcraft/mod/common/block/tile/TileEntityCompressor.java
	common/steamcraft/mod/common/block/tile/TileEntityElectricMachine.java
	common/steamcraft/mod/common/block/tile/TileEntityMachine.java
	common/steamcraft/mod/common/block/tile/TileEntityNukeFurnace.java
	common/steamcraft/mod/common/block/tile/TileEntitySteamFurnace.java
	common/steamcraft/mod/common/block/tile/container/ContainerCompressor.java
	common/steamcraft/mod/common/core/helper/CompatHelper.java
	common/steamcraft/mod/common/item/ItemElectricMod.java
	common/steamcraft/mod/common/item/ModArmors.java
	common/steamcraft/mod/common/item/ModGuns.java
	common/steamcraft/mod/common/item/ModItems.java
	common/steamcraft/mod/common/item/ModTools.java
	common/steamcraft/mod/common/lib/BlockIDs.java
	common/steamcraft/mod/common/lib/CreativeTabsMod.java
	universalelectricity/api/energy/EnergyStorageHandler.java
Merged the Nightly with the Master branch.
Merge branch 'work_branch'

Conflicts:
	common/steamcraft/mod/common/block/tile/TileEntityCoalGenerator.java
	common/steamcraft/mod/common/block/tile/TileEntityCompressor.java
	common/steamcraft/mod/common/block/tile/TileEntityElectricGenerator.java
	common/steamcraft/mod/common/block/tile/TileEntityElectricMachine.java
	common/steamcraft/mod/common/block/tile/container/slot/SlotBattery.java
	common/steamcraft/mod/common/item/ItemElectricDrill.java
	common/steamcraft/mod/common/item/ItemElectricMod.java
	common/steamcraft/mod/common/item/ModTools.java
	common/steamcraft/mod/common/util/EnergyUtils.java
Merged the Nightly and Master branches succesfully(hopefully, please
check if anything is missing)
Also finished working on Electric Items and Machines.
Why doesn't the lib folder get tracked?
...