Aidan C. Brady
|
86b8499bb5
|
A bit more organizing, nothing API related
|
2013-08-26 18:57:08 -04:00 |
|
Aidan C. Brady
|
6af0b1abd7
|
Screw it, package organization (sorry, that's an API update)
|
2013-08-26 18:49:32 -04:00 |
|
Ben Spiers
|
8f4b19f87c
|
A slightly surprisingly large number of unused imports
|
2013-08-23 19:25:26 +01:00 |
|
Aidan Brady
|
26e86c8eee
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Conflicts:
common/mekanism/client/RenderMechanicalPipe.java
common/mekanism/common/BlockBasic.java
|
2013-07-20 12:15:34 -04:00 |
|
Aidan Brady
|
cfc5dff445
|
First 1.6 push, still work to be done
|
2013-07-20 12:10:14 -04:00 |
|
Ben Spiers
|
ec9d74fe1a
|
Hopefully solve all the rendering-based memory leaks
|
2013-07-19 19:59:01 +01:00 |
|
Aidan Brady
|
b255a98a74
|
Rebase for new workspace (sorry)
|
2013-06-28 18:01:00 -04:00 |
|