First draft. Still lots to do.
Merge branch 'master' into mc1.5
Huge amount of fixes. Still a LOT to go.
Renamed pipe related textures
Ported Pipe textures (Pipe "api" changed for submods)
Ported Wire textures
Updated pipe sync to accomodate Icons
Updated all pipes to new "api"
Nerfed Herobrine
Migrated gates
Minor renaming
Fix derp
Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update
Split sheets for krapht
Moved GuiIcons and Triggers to subfolders
Cleaned up icons for items and textures
Renamed getCollisionBoxes to addCollisionBoxesToList after forge/fml update
Fixed Action/Trigger textures
Fixed rename.
A bunch of fixups. The code *runs*, but there's a lot of gfx issues to fix up.
Merge remote-tracking branch 'remotes/techjar/mc1.5' into 1.5.0

Conflicts:
	common/buildcraft/core/EntityRobot.java
update mc and forge version to 1.5