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

1464 commits

Author SHA1 Message Date
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
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
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
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
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
mymagadsl
b423a1d2b9 Update zh_TW.lang 2015-04-02 17:48:23 +08: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
20a91e655f Merge pull request #2439 from Vexatos/patch-8 
Update de_DE.lang
 2015-04-01 13:10:30 -04:00
Vexatos
e12290b540 Fixed en_US.lang 2015-04-01 19:02:10 +02:00
Vexatos
1f056925cb Update de_DE.lang 2015-04-01 19:01:27 +02:00
Vexatos
abbca5ffd1 Update de_DE.lang 2015-04-01 18:59:48 +02:00
Aidan C. Brady
1bce16b1ad Localization fix 2015-04-01 11:09:15 -04: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
Vexatos
f4ec705b32 Fixed Mekanism API 2015-03-31 15:11:45 +02: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
6ce51b0b8d Finished Reactor Logic Adapter 2015-03-29 16:02:57 -04:00
Aidan C. Brady
7d521ea841 Logic adapter work 2015-03-29 15:23:13 -04:00
Aidan C. Brady
0f54c21cf2 More work on logic adapter 2015-03-29 14:47:09 -04:00
Aidan C. Brady
78ed108904 Merge branch 'development' into v8.1 2015-03-29 14:20:11 -04:00
Aidan C. Brady
3a6529eac5 Fixed a reactor crash 2015-03-29 14:17:39 -04:00
Aidan C. Brady
834913f5a4 Work on Reactor Logic Adapter 2015-03-29 14:17:04 -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
a87fb35c2c Merge branch 'master' into development 2015-03-29 11:02:47 -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
Mr-tanaka3
0f5788d7e1 Update ja_JP.lang 2015-03-29 22:04:26 +09: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
Aidan C. Brady
0c9fd9364e Fixed usage displays of certain machinery 2015-03-29 00:42:40 -04:00
Aidan C. Brady
cd323920fe Fixed Crusher texture 2015-03-29 00:12:49 -04:00
Aidan C. Brady
2605751af0 Added some nicer tooltips to Oredictionificator interfaces 2015-03-28 23:51:38 -04:00
Aidan C. Brady
ac41365c86 Fixed "dump excess mode" making gas levels jump up and down, fixed a few particles issues 2015-03-28 21:44:18 -04:00
Aidan C. Brady
f10a352230 Fixed Diversion Transporter not updating surroundings when changing diverter mode 2015-03-28 21:12:34 -04:00
Aidan C. Brady
0b1b78d5a6 Fixed Restrictive Transporter render in both item and block form 2015-03-28 21:09:07 -04:00
Aidan C. Brady
5da4a522cb A few Portable Teleporter fixes 2015-03-28 20:34:57 -04:00
Aidan C. Brady
3e4fe02449 Fixed Teleporter Frame asset 2015-03-28 17:41:48 -04:00
Aidan C. Brady
1fbf9f1568 Merged 2015-03-28 17:34:47 -04:00
Aidan C. Brady
542b995b3b Electric Pump and Fluidic Plenisher now have CC support for resetting their calculations 2015-03-28 17:27:43 -04:00
Aidan C. Brady
f2d9049a2e Flamethrower now only sets blocks to fire on server 2015-03-28 17:10:55 -04:00
Aidan C. Brady
07d0c2bfc1 Hopefully fixed negative buffer issue 2015-03-27 17:09:23 -04:00
Aidan C. Brady
543d45d57a Fixed a few models, fixed a crash 2015-03-27 13:09:41 -04:00
Aidan C. Brady
fba7fb34f0 Fixed ItemRetriever 2015-03-27 12:49:29 -04:00
Aidan C. Brady
a0af78ef46 Teleporters now follow CTM 2015-03-26 23:53:22 -04:00
Aidan C. Brady
3ba0dd5172 Bins now use the dynamic texture render system 2015-03-26 20:03:46 -04:00
Aidan C. Brady
babc934079 Hopefully fix an issue 2015-03-26 18:13:33 -04:00
Aidan C. Brady
b15499f465 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2015-03-26 18:09:02 -04:00
Aidan C. Brady
2546d9c28e Bump version to 8.0.3 2015-03-26 18:08:56 -04:00
Aidan
e5e7a5568f Merge pull request #2382 from TheVikingWarrior/patch-2 
Update it_IT.lang
 2015-03-26 17:55:32 -04:00
Aidan C. Brady
266becb27a Fixed factory top active dynamic texture 2015-03-26 17:30:16 -04:00
Aidan C. Brady
bf5e6b788f A few fixes for the last commit 2015-03-26 17:23:41 -04:00
TheVikingWarrior
b5635023d0 Update it_IT.lang 2015-03-26 22:16:10 +01:00