Aidan C. Brady
d24eaddee4
Added in algorithm to merge both fluid and item data of Dynamic Tank multi blocks
2014-08-20 08:49:52 -04:00
Aidan C. Brady
540eed908e
Added cache implementation of EIM
2014-08-20 08:27:44 -04:00
Ben Spiers
c24c11cb33
Make things like the ExtraUtils muffler actually have an effect on our machines. VERY HACKY.
2014-08-20 01:30:55 +01:00
Aidan C. Brady
6b4ef3bb50
Merge branch 'development' into 1.8
2014-08-19 19:08:47 -04:00
Aidan C. Brady
8c58a9eaed
Fixed crash related to OreDictCache
2014-08-19 19:06:50 -04:00
Aidan C. Brady
833e0dc385
Began base implementation of the Energized Induction Matrix
2014-08-19 12:40:57 -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
ed11c63b4a
Merge branch 'development' into 1.8
2014-08-19 08:42:04 -04: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
f8c954fbe2
Change the small transmitter model to solve the texture problem.
2014-08-18 23:23:23 +01:00
Aidan C. Brady
57452a562e
Fixed a crash, also fixed the Logistical Transporter not connecting on chunk load.
...
I have absolutely no idea why, but for some reason calling isBlockProvidingIndirectPowerTo() before checking connections fixes the issue. Probably something related to chunk loading.
2014-08-18 16:10:44 -04:00
Aidan C. Brady
497af914dc
Cleanup
2014-08-18 08:48:05 -04:00
Aidan C. Brady
b657c0fb55
Fixed Diversion Transporter not rendering unlit redstone torch, forced Diversion Transporter to render center
2014-08-18 08:23:25 -04:00
Aidan C. Brady
f0dd207c79
Fixed transmitter texture inconsistency, fixed Logistical Transporter render
2014-08-18 08:01:20 -04:00
Aidan C. Brady
b408154e63
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-17 21:36:23 -04:00
Aidan C. Brady
aa2c79672b
Began the actual implementation of PathfinderCache
2014-08-17 21:36:16 -04:00
Aidan Brady
13a88c64bf
Merge branch 'development' into 1.8
2014-08-17 15:57:03 -04:00
Ben Spiers
db8ec6cb2e
Fix energy and gas transmitters rendering without proper transparency.
2014-08-17 17:25:55 +01:00
Ben Spiers
c706d2ebb1
Fix ports not connecting and being able to reignite a hot reactor without the proper procedure.
2014-08-17 04:20:14 +01:00
Ben Spiers
090bd9b9c3
Get rid of two redundant factory methods.
2014-08-17 04:18:34 +01:00
Ben Spiers
0ac4494049
Fix Gas Networks losing all their capacity
2014-08-17 04:17:12 +01:00
Ben Spiers
a9191fad32
Fix Dissolution Chamber upgrades.
...
Closes #1690
2014-08-16 17:22:07 +01:00
Aidan C. Brady
9b46044391
Step 1 of enormous Logistical Transmitter efficiency overhaul - the recursive inventory finder algorithm has been eliminated with the use of the InventoryNetwork's consistency.
2014-08-16 02:46:07 -04:00
Aidan C. Brady
d3b5676e43
Transmitter networks now keep track of all connected sides of acceptors. This should fix many future bugs, and it will also allow me to implement a better caching system for Logistical Transporters.
2014-08-15 16:21:58 -04: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
73f23abc84
Reduce default hydrogen energy density to match old hydrogen generator generation, by popular demand. Add comment to avoid confusion over electrolytic separator usage.
2014-08-15 03:29:49 +01:00
Ben Spiers
8f9a2d31ee
Overhaul transmitter rendering, to make everything look a little nicer. Turn-offable by config in case people prefer the "classic" look.
2014-08-15 03:27:04 +01:00
Ben Spiers
3fcce24bac
Move client configs to their own category, with new gui screen to match.
2014-08-15 02:58:44 +01:00
Ben Spiers
41e118ba2e
Merge branch 'development' into 1.8
2014-08-14 23:37:28 +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
Ben Spiers
e4c2692e64
Fix not sending tile updates
2014-08-14 23:05:32 +01:00
Ben Spiers
dc922a3914
Remove two entirely unreferenced Config variables from the config class.
...
logPackets is unused as well, but is still present in the config file.
Presumably got lost in the 1.7 update. @aidancbrady, should we reimplement
the functionality, or remove the option?
2014-08-13 03:38:55 +01:00
Ben Spiers
9739068822
Make Glow Plastic microblocks glow.
2014-08-13 03:37:05 +01:00
Ben Spiers
22d80c2953
Make reinforced plastic blocks actually harder and more explosion-resistant than the others
2014-08-13 03:36:47 +01:00
Ben Spiers
ddc67b475a
Microblock-enable our blocks.
...
Use IMC where custom materials aren't necessary to leave as much as possible up to CB.
2014-08-12 23:24:52 +01:00
Aidan C. Brady
9f91e0886e
Gave the Upgrade Management GUI a scrollbar to allow for more than 4 upgrade types to be present in a single machine
2014-08-11 15:15:09 -04:00
Aidan C. Brady
237f2cbab5
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-11 12:31:51 -04:00
Aidan C. Brady
1833bc0796
Implemented InvTweaks API. @unpairedbracket, mind sorting out the @Optional stuff for this? I'm not sure how to do that with annotations.
2014-08-11 12:31:40 -04:00
Ben Spiers
60130d0616
Restrict the creative frequencies to creative-moded players.
2014-08-11 00:56:23 +01:00
Ben Spiers
84c13e098c
Add creative frequencies to the entangled blocks.
...
Adds the uility of being able to generate "infinite" (Integer.MAX_VALUE) amounts of fluids or gases.
2014-08-11 00:55:48 +01:00
Aidan C. Brady
0bab2c21e6
Quick fix
2014-08-10 16:13:23 -04:00
Aidan C. Brady
ee47115b5a
Finished off GuiScrollList and implemented it in the Dictionary :)
2014-08-10 16:11:29 -04:00
Aidan Brady
c38d0e4828
A bit more work
2014-08-10 00:23:26 -04:00
Aidan Brady
62743cfda7
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-10 00:14:19 -04:00
Aidan Brady
89bc7edc95
Started work on a scroll list GUI element
2014-08-10 00:14:12 -04:00
Ben Spiers
de880c5ab0
Make Pressurized Tubes able to pull from IGasHandlers. Hopefully I didn't screw anything up too badly.
2014-08-10 03:34:01 +01:00
Aidan Brady
c66f3a44b7
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
2014-08-09 22:20:59 -04:00
Aidan Brady
1d6de974d3
A bit of package reorganization, added InventoryNetwork to transporters
2014-08-09 22:20:49 -04:00
Ben Spiers
191d964003
More Entanglement work. Now has a gui, can set it's frequency.
2014-08-10 02:17:02 +01:00
Aidan C. Brady
98ee002472
Merge back the network fixes
2014-08-09 13:43:59 -04:00
