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 Brady
|
92bee121b2
|
Update IC2 API
|
2013-08-29 18:57:13 -04:00 |
|
Aidan Brady
|
55fee96644
|
Updated IC2 API (again), added obsidian 200% ore-to-dust processing
|
2013-08-25 12:02:25 -04:00 |
|
Aidan Brady
|
2d592b57eb
|
Revert "Merge"
This reverts commit 5a1e2fe6ff.
|
2013-08-25 11:01:40 -04:00 |
|
Aidan Brady
|
5a1e2fe6ff
|
Merge
|
2013-08-25 11:01:30 -04:00 |
|
Aidan C. Brady
|
5072b20673
|
Updated IC2 API, modularized energy management
|
2013-08-22 11:36:31 -04:00 |
|
Aidan Brady
|
b255a98a74
|
Rebase for new workspace (sorry)
|
2013-06-28 18:01:00 -04:00 |
|