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 |
|
Ben Spiers
|
92c3cb6811
|
Fix Mechanical Pipe non-vanilla liquid rendering. Closes #186
|
2013-07-17 20:01:16 +01:00 |
|
Aidan Brady
|
3f8deb946a
|
Re-enabled face culling, re-fixed getPickBlock()
|
2013-07-08 18:52:03 -04:00 |
|
Aidan Brady
|
c27f4d06bc
|
Git always finds a way to screw things up, re-added new transmitter renderer
|
2013-07-08 12:41:31 -04:00 |
|
Aidan Brady
|
b313f0f96e
|
Slightly better transmitter rendering, better energy cube outputting
|
2013-07-08 12:06:39 -04:00 |
|
Aidan Brady
|
1468fc05bd
|
Fixed Universal Cable render
|
2013-07-07 13:22:24 -04:00 |
|
Aidan Brady
|
37e442c17b
|
Removed "upgrade dump" configurator mode, upgrades can now be removed in GUIs
|
2013-07-06 21:33:08 -04:00 |
|
Aidan Brady
|
17d4acf389
|
Fixed IC2 integration, minor cleanup
|
2013-07-02 13:25:56 -04:00 |
|
Aidan Brady
|
52ceee1259
|
Mechanical Pipe crash fix, Dynamic Tank GUI fix
|
2013-06-29 23:06:24 -04:00 |
|
Aidan Brady
|
a667f9a3b6
|
v5.5.6 Beta #24
*Removed Mechanical Pipe & Universal Cable redstone toggle.
*Fixed render crash.
*Fixed version println.
|
2013-06-29 17:24:54 -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 |
|