Aidan Brady
|
cd53a8b4db
|
Re-commit Dynamic Tank fix
|
2013-07-20 12:17:58 -04: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 |
|
Ben Spiers
|
14c56c6041
|
Fix infinite liquid dupe bug.
|
2013-07-18 02:25:02 +01:00 |
|
Ben Spiers
|
92c3cb6811
|
Fix Mechanical Pipe non-vanilla liquid rendering. Closes #186
|
2013-07-17 20:01:16 +01:00 |
|
Aidan Brady
|
1b039bce4b
|
Tiny cleanup
|
2013-07-08 18:58:26 -04:00 |
|
Aidan Brady
|
3f8deb946a
|
Re-enabled face culling, re-fixed getPickBlock()
|
2013-07-08 18:52:03 -04:00 |
|
Ben Spiers
|
745f7d1f44
|
Hopefully re-fix #152
|
2013-07-08 23:38:53 +01:00 |
|
Ben Spiers
|
e50701da02
|
Hopefully fix NPE with Immibis' microblocks and avoid issue #152 recurring
|
2013-07-08 23:03:02 +01:00 |
|
Ben Spiers
|
73627f675a
|
Make transmitters drop when shift-wrenched, like TE conduits
|
2013-07-08 20:47:10 +01:00 |
|
Ben Spiers
|
b2c32527c6
|
Add canWrench() checks to Block classes' onBlockActivated() methods
to fix the mmMPS powerFist always rotating Mekanism machines.
|
2013-07-08 20:43:28 +01: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
|
ce09a8225f
|
Formatted EnergyMeter PR, merged Energy Cube comparator support
|
2013-07-07 13:07:40 -04:00 |
|
Aidan
|
3ea43f6f64
|
Merge pull request #179 from unpairedbracket/power-squashed
Add Power Reading to EnergyMeter
|
2013-07-07 09:58:31 -07: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
|
37e442c17b
|
Removed "upgrade dump" configurator mode, upgrades can now be removed in GUIs
|
2013-07-06 21:33:08 -04:00 |
|
Aidan Brady
|
0fb90be4c7
|
Crusher sound volume decreased, upgrades now sustained in recipes
|
2013-07-06 17:01:13 -04:00 |
|
Ben Spiers
|
6183761f68
|
Add an EnergyNetworkRegistry to keep track of Energy Networks and act as a singleton tick handler.
|
2013-07-06 03:14:33 +01:00 |
|
Ben Spiers
|
1241fa18a9
|
Refactor EnergyNetwork.split() to make sure lots of unneeded networks aren't created
|
2013-07-06 02:42:41 +01:00 |
|
Ben Spiers
|
b740f05079
|
Add power recording to networks and display to EnergyMeter
|
2013-07-05 18:39:54 +01:00 |
|
Ben Spiers
|
49fcac6d3c
|
Use ElectricityDisplay for human-readable EnergyMeter units.
|
2013-07-05 17:52:47 +01:00 |
|
Aidan Brady
|
7df5888bd3
|
Added EnergyMeter
|
2013-07-02 19:03:03 -04:00 |
|
Aidan Brady
|
17d4acf389
|
Fixed IC2 integration, minor cleanup
|
2013-07-02 13:25:56 -04:00 |
|
Aidan Brady
|
29749ca510
|
Containers can now be accessed anywhere
|
2013-06-29 23:19:46 -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 |
|