Thermal API and Machine work. 

Instead of TileEntityMachine using elecricity, 
TileEntityMachine handles generic power types, with
TileEntityElectricMachine handling elecricity, and other types for other
energy forms, like TileEntityThermalMachine for the new Thermal API. 

Also, Redstone Flux capacity.