tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
285 commits 2 branches 0 tags 102 MiB
Commit graph

285 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Spiers
b3909b7e6e Add debug info to EnergyMeter 2013-07-29 22:52:31 +01:00
Ben Spiers
30ca7d82d6 Add ability to manually force-fix a network using a configurator 2013-07-29 22:48:12 +01:00
Ben Spiers
b01cf3b8f7 Make it so that /mk is always available in SSP 2013-07-29 21:38:10 +01:00
Ben Spiers
18519b5fa6 Fix the EnergyNetwork memory leak. 2013-07-29 21:30:43 +01:00
Ben Spiers
c2c031ef2a Clean up a bit of unnecessary logic 2013-07-29 21:06:01 +01:00
Ben Spiers
735b281341 Fix a little derp in getPower() 2013-07-29 21:03:31 +01:00
Ben Spiers
6a562117b6 Fix ArrayIndexOutOfBoundsException in Electric Chest when attached to AE import buses and presumably other things. 2013-07-29 21:02:36 +01:00
Ben Spiers
0188882688 Fix the Electric Pump's render texture 2013-07-29 21:00:51 +01:00
Aidan
3cd0106c6f Welcome to the team, @unpairedbracket! 2013-07-27 21:58:40 -04:00
Aidan Brady
db5588ddb9 Fixed StackOverflowException with MFR, fixed incorrect UE charging values 2013-07-27 19:32:46 -04:00
Aidan Brady
aa3dcd0262 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-27 12:01:16 -04:00
Aidan Brady
dedb2ebdcf Fixed ControlCircuit recipe bug 2013-07-27 12:01:08 -04:00
Calclavia
0ea223fbcb Update build.xml 2013-07-27 11:40:16 -04:00
Calclavia
fdb05ab9eb Merge pull request #198 from calclavia/patch-1 
Fixes Mekanism causing constant broken builds
 2013-07-27 08:34:54 -07:00
Calclavia
73bda3e873 Fixes Mekanism causing constant broken builds 2013-07-27 11:24:21 -04:00
Aidan Brady
db8725e1a4 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-07-26 18:16:28 -04:00
Aidan Brady
5d26f8e229 Updated to new UE, not done with complete implementation 2013-07-26 18:16:21 -04:00
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