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

3060 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Spiers d73eed2865 Fix the draining issue 2015-04-12 00:09:35 +01:00
Ben Spiers 17e1cea25a Possible fix for EnergyNet weirdness. 2015-04-11 14:27:21 +01:00
Ben Spiers 420e1619e6 Clean up some TransporterPathfinder stuff. 2015-04-10 23:55:59 +01:00
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 5b558065fc Might fix the NPE in FluidNetwork that @NitroxydeX was experiencing 2015-04-10 18:54:38 +01:00
Ben Spiers 468abefe17 Fix NPE on creating networks. 2015-04-10 18:39:27 +01:00
Ben Spiers cb95cfeedd Fix ITubeConnection acceptors that aren't IGasHandler 2015-04-10 18:39:06 +01:00
Aidan 4aad2e5364 Merge pull request #2494 from Vexatos/patch-10 2015-04-10 08:59:20 -04:00
Vexatos 6bb5ff81da Update de_DE.lang 2015-04-10 14:53:57 +02:00
Aidan C. Brady f39d6d097d Merge branch 'master' into development 2015-04-10 08:34:14 -04: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
Aidan e6519da9b5 Merge pull request #2490 from TehStoneMan/development 
Development
 2015-04-09 10:29:14 -04:00
TehStoneMan 76a21dfdf3 Merge remote-tracking branch 'upstream/development' into development 2015-04-09 11:44:38 +10:00
TehStoneMan 4d50a3503a Changed name of Obsidian Ingot to avoid confusion with other mods 
Changed "Obsidian Ingot" to "Refined Obsidian Ingot" as some other mods
(for example Tinker's Construct) also have obsidian ingots that are
technically a different material with a different ore dictionary entry.
 2015-04-09 11:42:39 +10: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
Aidan C. Brady a61974a681 Cleanup 2015-04-06 10:12:59 -04:00
Aidan 6c5f0e1a6e Merge pull request #2470 from TehStoneMan/development 
Changes to Logistical Sorter GUI
 2015-04-06 09:44:10 -04:00
Ben Spiers 1997054bad Merge branch 'development' into networkRefactor 2015-04-06 04:36:11 +01: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 87bb257147 Merge remote-tracking branch 'upstream/development' into development 2015-04-06 08:32:36 +10:00
Aidan C. Brady cbb8cbc0b0 Added a null check - this may fix some other issues 2015-04-05 13:02:57 -04:00
Aidan 01285fc203 Merge pull request #2475 from WhitePhoenix0/master 
Added AmbientAccumulators.png
 2015-04-05 13:00:42 -04:00
Aidan d97cc960fc Merge pull request #2472 from Kodos-Atoz/patch-1 
Update en_US.lang
 2015-04-05 13:00:37 -04:00
WhitePhoenix0 91423c38a8 Added temp AmbientAcculmulator.png 
Stops the missing texture errors until this can be resolved properly.
 2015-04-05 08:45:33 -07: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
Kodos Atoz 22d37b14bf Update en_US.lang 
Added basic tooltip for the new reactor logic port.  Feel free to change this as you feel.
 2015-04-05 05:09:21 -05:00
TehStoneMan 50e72bc381 Merge remote-tracking branch 'upstream/development' into development 2015-04-05 08:52:06 +10:00
TehStoneMan cb9a10cdcf Updates to Logistical Sorter GUI 
Add scroll wheel control to scrollbar.
Dim scrollbar when nothing to scroll.
Remove blank space when scrolled to end of list.
Add move filter up/down buttons to GUI (Not yet functional)
 2015-04-04 23:34:27 +11: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 63f751c710 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2015-04-03 10:14:33 -04:00