Commit graph

2136 commits

Author SHA1 Message Date
Ben Spiers 9294719ab2 Cleanup
Remove unused vars, add @Overrides, update deprecated methods.
2014-08-28 20:07:51 +01:00
Ben Spiers e3fc694532 Fix Gas Generator item gas tank restoration. 2014-08-28 20:00:56 +01:00
Ben Spiers e16a39912e Configurator Overhaul. Modes now more accurately descriptive.
Now only configurates in mode 0, mode 1 unchanged, mode 2 only
rotates and mode 3 acts as a buildcraft wrench.
2014-08-28 19:59:50 +01:00
Ben Spiers 39509fc133 Fix I goofed. 2014-08-28 03:13:11 +01:00
Ben Spiers dd3ae67750 Fix some pretty severe plenisher problems that must have gone a while relatively unnoticed. 2014-08-28 03:12:58 +01:00
Ben Spiers 40c06f1004 Fix secondary energy consumption with speed upgrades.
Might make them less efficient with speed upgrades and add a secondary
energy upgrade that mitigates this, like the current energy upgrade.
2014-08-27 02:17:45 +01:00
Aidan C. Brady 6714034771 Fixed RedstoneArsenal dependency 2014-08-24 16:32:20 -04:00
Aidan C. Brady c364496212 Fixed the evil Bounding Block crash, fixed Dynamic Tank crashing when flowing icon is null 2014-08-24 09:46:38 -04:00
Aidan C. Brady bbef6aa2b9 A couple crash fixes 2014-08-23 11:07:03 -04:00
Aidan C. Brady a0622523d1 Added check for 7.0-7.1 Bin crashes 2014-08-20 14:38:11 -04:00
Aidan C. Brady 333fcd8ef1 Added a check to prevent null world calls 2014-08-20 14:35:19 -04:00
Aidan C. Brady baae072601 Merged the updateCapacity() fix to development 2014-08-20 14:07:54 -04:00
Aidan C. Brady 8c58a9eaed Fixed crash related to OreDictCache 2014-08-19 19:06:50 -04:00
Ben Spiers 6316ec5fd5 Fix the network fix (doEmit was always being called with tryAgain false). 2014-08-19 16:42:38 +01:00
Aidan C. Brady a8993cb223 Only break Logistical Sorter algorithm when items are actually sent 2014-08-19 08:35:43 -04:00
Ben Spiers a9191fad32 Fix Dissolution Chamber upgrades.
Closes #1690
2014-08-16 17:22:07 +01:00
Ben Spiers db3c7863fe Cherry-pick:
Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage.
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
2014-08-15 03:39:16 +01:00
Ben Spiers 7813fad1ab Make redstone-split transmitters join correctly again. Presumably this being broken is why merge() was unused. 2014-08-14 23:30:27 +01:00
Aidan C. Brady 98ee002472 Merge back the network fixes 2014-08-09 13:43:59 -04:00
Aidan C. Brady a3c6b9dac2 Fixed cable functionality 2014-08-09 13:28:40 -04:00
Aidan C. Brady ed919fa19a Fixed the no-update issues 2014-08-08 22:08:55 -04:00
Aidan Brady a0b8ab0331 Quick cleanup 2014-08-08 21:25:59 -04:00
Aidan Brady 4d4926d0df Fixed Dynamic Tanks not updating when being filled with buckets. I knew I missed something. 2014-08-08 21:21:28 -04:00
Ben Spiers 520bf46332 Fix my typo 2014-08-08 21:51:37 +01:00
Ben Spiers cf18bc45a2 Remove unnecessary entity registrations - registerModEntity does it for us. Pray to any and all applicable supernatural entities that this solves the (EntityLivingBase)EntityBalloon crash 2014-08-08 18:25:47 +01:00
Aidan C. Brady 6ff0a147e4 More fixes 2014-08-08 00:00:33 -04:00
Aidan C. Brady 312c8ef127 Push back those fixes 2014-08-07 23:45:30 -04:00
Aidan C. Brady 12ad58b1f9 Turns out I was sending a ton of packets to the entire player list on the server when it wasn't actually necessary at all, switched to new sendToReceivers() method 2014-08-07 22:48:35 -04:00
Aidan C. Brady 7634c29df9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-08-07 21:33:23 -04:00
Aidan C. Brady 1fd5e498e8 Major packet improvements - trying to get on the good side of server owners. More to come.
Instead of sending to all players in a dimension or within a defined range, packets will now only be sent to players who have the chunk loaded that the packet is being sent from on the server.
2014-08-07 21:33:17 -04:00
Aidan Brady 008afaf359 Merge branch 'master' into development 2014-08-07 12:21:11 -04:00
Ben Spiers 91dbb7fcd6 Add CC IPeripheralProvider to Bounding, EnergyCube and Generator blocks 2014-08-07 17:17:22 +01:00
Ben Spiers 799f49d9b6 Move to Forge block rotation implementation.
Hopefully the configurator should rotate more stuff now and more wrenches should be able to rotate our blocks
2014-08-07 17:17:22 +01:00
Ben Spiers 2ba639f8fc Fix running with Forestry but not BC. 2014-08-07 03:58:01 +01:00
Aidan Brady 14b40d901a Started work on Range4D for new packet system 2014-08-06 18:49:32 -04:00
Aidan Brady 78c0cc4c7c Fixed an issue where networks would be forgotten, made shift-M turn jetpack off immediately, simplified network code a bit 2014-08-06 18:25:33 -04:00
Aidan Brady 321411ee3a Fixed incorrect Advanced Solar Generator generation rate display 2014-08-06 13:56:01 -04:00
Aidan Brady 08914da371 Fixed Electric Pump lag - was able to completely eliminate system of node cleaning while boosting performance immensely 2014-08-06 13:44:59 -04:00
Aidan Brady 20dc1ae28a Bump version to 7.1.0. 2014-08-06 12:51:48 -04:00
Aidan Brady 7c8208026b Merge branch 'master' into development 2014-08-06 12:34:46 -04:00
Aidan Brady 1896a42afa Cleaned up that fix 2014-08-05 22:31:57 -04:00
Ben Spiers a865a19340 Implement canConnectEnergy so RF cables don't connect when they shouldn't 2014-08-06 02:51:25 +01:00
Aidan C. Brady 7a67fbf7ca Fluidic Plenisher now detects block updates directly below it, and will replace the block if necessary. Will also no longer replace other source blocks. 2014-08-05 21:27:10 -04:00
Aidan C. Brady 12215490f0 Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage 2014-08-05 20:58:22 -04:00
Aidan C. Brady 06c66d5fbe Tiny cleanup 2014-08-05 17:07:09 -04:00
Aidan C. Brady 87c7d888f5 Merge branch 'master' into development 2014-08-05 16:56:02 -04:00
Aidan C. Brady 873af4be2e Cleanup 2014-08-05 16:55:55 -04:00
Aidan C. Brady ed9db80245 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-08-05 16:53:48 -04:00
Aidan C. Brady 27b61e288a Fixed a few bugs 2014-08-05 16:53:40 -04:00
Aidan aee18c0181 Merge pull request #1622 from bshelden/1614-powergen-config
Added additional power generation configuration (#1164)
2014-08-05 16:52:59 -04:00