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
|
ce09a8225f
|
Formatted EnergyMeter PR, merged Energy Cube comparator support
|
2013-07-07 13:07:40 -04:00 |
|
Aidan Brady
|
540823ef4a
|
Removed Wind Turbine bound checking
|
2013-07-07 12:17:51 -04:00 |
|
Aidan Brady
|
bc4a34c189
|
Less client-based lag on machines and generators
|
2013-07-07 12:13:52 -04:00 |
|
Aidan Brady
|
8f6ad2688e
|
General cleanup
|
2013-06-28 19:43:45 -04:00 |
|
Aidan Brady
|
b255a98a74
|
Rebase for new workspace (sorry)
|
2013-06-28 18:01:00 -04:00 |
|