Commit graph

838 commits

Author SHA1 Message Date
Ben Spiers
7b4404a973 Remove an unused parameter. 2015-04-10 23:55:59 +01:00
Ben Spiers
91d323ccdd Maybe fix negative buffer issues . 2015-04-10 23:55:59 +01:00
Ben Spiers
05508b598a Fix non-overworld dimensions. 2015-04-10 19:21:34 +01:00
Ben Spiers
cb95cfeedd Fix ITubeConnection acceptors that aren't IGasHandler 2015-04-10 18:39:06 +01:00
Aidan C. Brady
5fec517a6d Crash fix 2015-04-10 08:34:02 -04:00
Aidan C. Brady
174509444b Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-04-10 08:24:34 -04:00
Aidan C. Brady
a03ef85f4c Fixed compile, bumped version to 8.1.1 2015-04-10 08:24:28 -04:00
Ben Spiers
94189a4f61 Fix Transporters with multipart. 2015-04-09 02:39:23 +01:00
Ben Spiers
4ca9456de8 Use path score to sort paths, not length. 2015-04-09 02:39:23 +01:00
Ben Spiers
36f0607d5e Prioritise faster paths, by making cost inversely proportional to speed. 2015-04-09 02:39:23 +01:00
Aidan C. Brady
068e4b58a7 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-04-07 10:42:50 -04:00
Aidan C. Brady
12ebfe6745 ThreadSparkle is now operated in main client thread time - new safety checks will prevent serious lag anyway 2015-04-07 10:41:17 -04:00
Ben Spiers
4a2dde8f87 Fix API, put back some methods that GC uses, optimise imports in API. 2015-04-06 18:53:16 +01:00
Aidan C. Brady
034d732e15 A bit more tidying 2015-04-06 11:10:57 -04:00
Aidan C. Brady
ec7b0555c9 Cleanup 2015-04-06 11:08:57 -04:00
Aidan
841e358ce0 Merge pull request #2478 from aidancbrady/networkRefactor
Network Refactor
2015-04-06 11:00:45 -04:00
Ben Spiers
f4a6fb8274 Do some things I TODOed earlier 2015-04-06 04:32:47 +01:00
Ben Spiers
d70595ad84 Fix a last few issues, and stop leaking networks on the client 2015-04-06 04:11:08 +01:00
TehStoneMan
f74acdfca6 Updated Digital Miner GUI
Updates to the Digital Miner config GUI to match changes to Logistical
Sorter GUI
2015-04-06 11:38:21 +10:00
Ben Spiers
c13b3b240f Fix some bugs with LogiTransporters 2015-04-06 02:18:45 +01:00
Ben Spiers
16ce88f09a Restore some client-side network stuff. More fixes 2015-04-06 01:29:07 +01:00
TehStoneMan
293b8c08f1 Sorting buttons now work
Got the sorting buttons to work. Clicking on the arrow buttons on a
filter panel will now move that filter up or down in the filter list.
Without having made any changed to how filters are processed, filters
higher in the list will naturally be processed before later filters,
thereby making it like a priority system.
For example, if an item matches two filters, the higher priority filter
will take that item before the lower filter, in that way seperating a
specific item from a broader (wildcard) specified filter.
2015-04-05 23:03:56 +10:00
Ben Spiers
ede0015eec Merge branch 'development' into networkRefactor
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
2015-04-04 02:58:26 +01:00
Ben Spiers
d29d1580bb Fix some stuff I missed in the merge, and server-client communication. 2015-04-04 02:44:14 +01:00
Aidan C. Brady
41cfed37b7 Fixed a few crashes 2015-04-03 20:21:05 -04:00
Ben Spiers
7a2461540f Merge branch 'development' into networkRefactor.
Hopefully I didn't miss anything

Conflicts:
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/client/render/RenderPartTransmitter.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/InventoryNetwork.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
	src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
	src/main/java/mekanism/common/multipart/PartPressurizedTube.java
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/PipeUtils.java
2015-04-03 19:45:25 +01:00
Ben Spiers
29659ad2cd Fix some client/server stuff, and fluid networks 2015-04-03 18:04:56 +01:00
Aidan C. Brady
8d38f63f5f Bumped version to 8.1.0 2015-04-01 23:09:27 -04:00
Ben Spiers
d14686ea2e Work on clientsiding, acceptors and things like redstone and multipart blocking. 2015-04-02 03:22:53 +01:00
Aidan C. Brady
45895cb753 Configurable values for Mekanism tier-related properties 2015-04-01 11:06:27 -04:00
Aidan C. Brady
dc0a90921a A few crash fixes 2015-04-01 09:06:23 -04:00
Ben Spiers
47b4eb28b4 Start on refactor of entire network system.
It will hopefully make networks more robust and efficient, using lessons learned since last time I rewrote large parts of it.
We can hopefully avoid Concurrent Modification issues this way, and it should be more forgiving on chunk loads as well.
Transmitter stuff is working well, next acceptors and client rendering need tobe brought in.
2015-04-01 02:42:36 +01:00
Aidan C. Brady
fe8cc9d1e0 Tiered Pressurized Tubes, better tooltips, better transmitter icons 2015-03-31 17:46:09 -04:00
Aidan C. Brady
1438d601e3 Better Mechanical Pipe textures 2015-03-31 13:44:57 -04:00
Aidan C. Brady
a5db67e2b7 Tiered Logistical Transporters 2015-03-31 11:39:10 -04:00
Aidan C. Brady
413fac32fa Logistical Transporters now render color in glass instead of frame 2015-03-31 08:47:40 -04:00
Aidan C. Brady
c85bdcd8ab Entity Detection mode for Laser Amplifier 2015-03-30 20:18:08 -04:00
Aidan C. Brady
e4d624d8ab Fancy new eject algorithms, should fix issues with PRC 2015-03-30 19:27:54 -04:00
Aidan C. Brady
b4c2664c5e Work a bit on a new, dynamic ejector system 2015-03-30 08:39:37 -04:00
Aidan C. Brady
af48daf73b When multiblenetworks of differing fluids/gasses merge, replace one, don't add up the total gas 2015-03-30 00:21:42 -04:00
Aidan C. Brady
0193e0b010 Hopefully drastically reduced necessary CPU time for transmitters when checking connections 2015-03-30 00:11:54 -04:00
Aidan C. Brady
4f29e497b4 Fixed amplifiers 2015-03-29 18:34:48 -04:00
Aidan C. Brady
f350055fab Universal Cables can now draw energy from laser amplifiers 2015-03-29 18:29:34 -04:00
Aidan C. Brady
2af3ef79f0 Merge branch 'development' into v8.1 2015-03-29 13:28:57 -04:00
Aidan C. Brady
b055b116e5 Don't reset induction cell storage 2015-03-29 13:26:43 -04:00
Aidan C. Brady
9b1aa2099b Started work on Reactor Logic Adapters 2015-03-29 12:50:15 -04:00
Aidan C. Brady
1c7f7a09ac Energy Cubes now use old localization standards 2015-03-29 11:01:54 -04:00
Aidan C. Brady
61735a27aa Fixed Solar Neutron Activator not rendering in inventory, fixed Solar Neutron Activator replacing blocks 2015-03-29 10:49:28 -04:00
Aidan C. Brady
6ec5a0a2fe Fixed Metallurgic Infuser output slot 2015-03-29 01:38:03 -04:00
Aidan C. Brady
9489270315 Fixed a few localization issues, fixed Electrolytic Separator dump excess mode on left tank 2015-03-29 00:54:43 -04:00