For the last damn time, add Smog already!
Merge pull request #19 from warlordjones/master

For the last damn time, add Smog already!
Work on integration between power systems.
Deleted TileEntityMod (obsolete)
Implemented proper TileEntityMachine, base tile for all the machines.
Moved Buildcraft API to its proper location.
Added EnergyUtils class that contains utilities for interacting with
energy.
Removed UE API.
Merge pull request #21 from decebaldecebal/master

Work on integration between power systems.
Updated COFH API.Work on integrating with TE.
Compatibility with TE and IC2.Everything should work perfectly, only
tested IC2 so far.
Add working electric item(sort of).Needs some work for TE compatibility.
Switched to a .lang file
Merge pull request #25 from warlordjones/master

Switched to a .lang file
Finished working on electric items.Fully integrated with TE and IC2.
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?
...
Renamed the Lib directories to Lib2.Seems that they are not indexed if
they are name Lib, but they are showed as indexed...
Merge branch 'master' into nightly