Ben Spiers
734835e695
Hopefully prevent potential (race condition?) NPE in osmium compressor.
2013-07-24 21:05:41 +01:00
Aidan Brady
13400fdc3d
Bumped version to 5.5.7
2013-07-20 12:35:37 -04:00
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
ea9dcf73ec
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
...
Conflicts:
resources/mods/mekanism/render/MechanicalPipe.png
resources/mods/mekanism/render/MechanicalPipeActive.png
resources/mods/mekanism/render/PressurizedTube.png
resources/mods/mekanism/render/UniversalCable.png
2013-07-08 12:15:07 -04:00
Aidan Brady
b313f0f96e
Slightly better transmitter rendering, better energy cube outputting
2013-07-08 12:06:39 -04:00
Aidan
6fc93bb0fd
Merge pull request #182 from unpairedbracket/transmitter-render
...
Transmitter rendering improvements
2013-07-08 09:04:02 -07:00
Ben Spiers
c6002cff51
Rewrite transmitter renderer to remove internal walls
2013-07-08 01:21:28 +01:00
Ben Spiers
39ab09bba8
Improve textures to remove inter-transmitter walls
2013-07-08 01:20:03 +01:00
Ben Spiers
0b786aa0b0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
common/mekanism/common/BlockEnergyCube.java
common/mekanism/common/TileEntityEnergyCube.java
2013-07-07 23:45:09 +01: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
645552e6fb
Build fix no.5
2013-06-28 18:25:05 -04:00
Aidan Brady
51e91c3859
Build fix no.4
2013-06-28 18:22:41 -04:00
Aidan Brady
957d0577fb
Build fix no.3
2013-06-28 18:11:34 -04:00
Aidan Brady
547563ed39
Build fix no.2
2013-06-28 18:10:10 -04:00
Aidan Brady
31fb314837
Fix build.xml
2013-06-28 18:03:47 -04:00
Aidan Brady
b255a98a74
Rebase for new workspace (sorry)
2013-06-28 18:01:00 -04:00
Aidan Brady
612d4ab5cb
Minor enhancements
...
*Touched up on @micdoodle8's work on the GasNetwork.
*Pressurized Tubes now connect visually to Gas Tanks.
*Fixed various network crashes.
2013-06-28 10:29:34 -04:00
micdoodle8
60932026af
Check if tubes can connect to each other and merge/split accordingly
2013-06-28 00:44:14 -04:00
micdoodle8
339ed31326
Test if tube can transfer gas to other tubes before adding them to the list of attached tubes.
2013-06-27 15:05:56 -04:00
Aidan Brady
63db62654a
v5.5.6 Beta #23
...
*Configuration for machine energy usage.
*Bumped default Theoretical Elementizer energy usage.
*Cleaned up code.
*Fixed UnsupportedOperationException in EnergyNetwork.
2013-06-27 11:03:50 -04:00
Aidan Brady
d94296631c
v5.5.6 Beta #22
...
*Updated textures.
*Revamped Gas/Liquid networks. *MDK UPDATE*
*Fixed redstone trigger on transmitters.
*Better cable connections.
*Liquid now renders with proper ItemStack-based color.
*Liquid now renders with flowing texture when in valve form.
2013-06-26 17:49:47 -04:00
Aidan Brady
0969a06dba
v5.5.6 Beta #21
...
*Liquid now renders with Item-based color.
*Better IC2/TE recipe integration.
*Cleanups.
2013-06-25 12:28:40 -04:00
