Commit graph

2 commits

Author SHA1 Message Date
Ben Spiers
7f4a603f64 Update ic2 API. AGAIN
Conflicts:
	common/mekanism/common/Mekanism.java
	common/mekanism/common/MekanismHooks.java
2013-09-28 03:20:43 +01:00
Aidan C. Brady
5072b20673 Updated IC2 API, modularized energy management 2013-08-22 11:36:31 -04:00