Commit Graph
380 Commits
Author SHA1 Message Date
Ben Spiers 17f9f88b34 Prevent Osmium Compressor and Combiner from using secondary energy upgrades.
Also make them deterministic again to prevent them getting stuck
2015-02-19 16:36:16 +00:00
Aidan C. Brady 0819c0ad5f Hopefully fixed the transmitter network halt issue. Provide feedback! 2015-02-19 09:13:03 -05:00
Aidan C. Brady dcf7d7772a Fixed a transporter output bug 2015-02-17 21:34:36 -05:00
Aidan C. Brady 488af7e8ae Fixed facing updates not being sent out by machines 2015-02-16 18:12:31 -05:00
Aidan b885742690 Merge pull request #2001 from Dannerick/master
Fix for #1997 gasGenerators incorrectly limiting output
2015-02-16 14:32:52 -05:00
Ben Spiers 0cef749249 Actually increment the Mod classes' versions 2015-02-13 14:40:14 +00:00
Ben Spiers 7e08643ebd ConcurrentHashMaps don't like null keys 2015-02-12 16:59:39 +00:00
Ben Spiers 122f4190bd Remove some bad/unneeded imports 2015-02-12 16:42:25 +00:00
Ben Spiers e6a4d3efb2 Screw it, let's just make these concurrent.
Keeping transmitters as a synchronizedSet-wrapped LinkedHashSet for now, because there isn't a ConcurrentLinkedHashSet.
2015-02-12 16:39:48 +00:00
Aidan C. Brady 81c948f28d Fixed capes 2015-02-11 08:36:52 -05:00
Ben Spiers 3e38ac37f4 This feature request has been more trouble than it's worth. 2015-01-19 12:16:04 +00:00
Ben Spiers 2ced2e3860 Fix the bad implementation of the ambient lighting toggle 2015-01-19 12:07:54 +00:00
Ben Spiers 1f9185dd01 Make the gas mask and jetpack maps synchronized 2015-01-10 18:17:17 +00:00
Ben Spiers 89be8b4482 Fix using localised names for overlay textures. 2015-01-10 17:47:16 +00:00
Ben Spiers c0db6b7eb5 Fix #2075, hopefully. 2015-01-07 23:58:23 +00:00
Ben Spiers 41cf1a2437 Move a bunch of registrations to PreInit.
I believe they should be happening there in the first place.
2015-01-07 23:13:45 +00:00
Ben Spiers 4b75a2f6a2 Hopefully improve the synchronization of the networks' transmitter sets 2015-01-07 23:13:10 +00:00
Ben Spiers fdde129180 Obfuscate password entry 2014-12-28 23:01:26 +00:00
Ben Spiers 3d4636d8da Config option for generator lighting 2014-12-27 21:37:20 +00:00
Ben Spiers f419c4e6d5 Fix anvil and snow pickup 2014-12-27 21:26:20 +00:00
Ben Spiers aea27f3bd6 Merge pull request #2029 from SoraZodia/master
@Interface removal for IPipeTile
2014-12-27 21:17:42 +00:00
Ben Spiers f63807c75a Fix some transmitter issues. 2014-12-27 21:09:34 +00:00
Ben Spiers c77e84ca6c Make cyan brighter 2014-12-22 23:41:33 +00:00
Ben Spiers 6aa84d1388 Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityPortableTank.java
2014-12-18 22:56:26 +00:00
Ben Spiers 1ce56d09e2 Fix Portable Tank NPE 2014-12-18 22:53:24 +00:00
Ben Spiers fd0bdd4da8 Efficiency of isValidAcceptor methods. 2014-12-18 22:52:45 +00:00
Brian Lewis b95836e6be Merge remote-tracking branch 'upstream/master' 2014-12-18 08:50:53 -06:00
Ben Spiers 6e422151be Merge branch 'master' into development 2014-12-16 20:34:55 +00:00
Ben Spiers 9a6b3c511e Fix a silly mistake 2014-12-16 20:33:23 +00:00
Ben Spiers d181dd9fd6 Oops. 2014-12-16 01:16:09 +00:00
Ben Spiers add14395e4 Merge branch 'master' into development 2014-12-15 17:29:45 +00:00
Ben Spiers e14501f3b5 Add RedstoneControl to Electric Pump. 2014-12-15 17:28:57 +00:00
SoraZodia 14a7383e6a @Interface removal for IPipeTile
It was causing an NoClassDefFoundError

In case you need proof, here's the crash log:
http://pastebin.com/9unZd9LG
2014-12-15 00:00:23 -10:00
Ben Spiers 7ebcba8528 Merge branch 'master' into development 2014-12-15 00:03:08 +00:00
Ben Spiers ee585c05dc Make glowing plastic blocks glow. 2014-12-15 00:02:22 +00:00
Ben Spiers a64cd69535 Merge branch 'master' into development 2014-12-14 18:17:36 +00:00
Ben Spiers a91dcc49d4 Introduce statistical consumption of gases. 2014-12-14 18:10:46 +00:00
Ben Spiers 123ed6c6c5 Merge branch 'master' into development 2014-12-14 01:54:49 +00:00
Ben Spiers e98026d78d Fix paxels 2014-12-14 01:53:26 +00:00
Brian Lewis 681d7e9963 Removed commented out test line 2014-11-28 12:20:29 -06:00
Brian Lewis 15b6f7e70c Fix for #1997 - gasGenerators now correctly limit output based on fuel type burned 2014-11-28 12:13:34 -06:00
Ben Spiers ce390ae426 Reorganise trait registration 2014-11-17 22:48:46 +00:00
Ben Spiers 0a0f67ee81 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:48:46 +00:00
Ben Spiers 5749ed4d2a Merge branch 'master' into development 2014-11-17 22:41:15 +00:00
Ben Spiers 1f2dd3162a Reorganise trait registration 2014-11-17 22:40:38 +00:00
Ben Spiers 1a8e2326b9 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 2014-11-17 22:40:18 +00:00
Ben Spiers 7ab1e66d6a Merge branch 'master' into development 2014-11-16 23:58:55 +00:00
Ben Spiers 11fac12840 Should fix #1762. 2014-11-16 23:58:12 +00:00
Aidan C. Brady a699a4b860 Merge branch 'master' into development 2014-11-16 11:45:13 -05:00
Aidan C. Brady e54edcf4cf Another fix attempt 2014-11-16 11:43:08 -05:00