Commit graph

3016 commits

Author SHA1 Message Date
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
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
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
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
Aidan C. Brady
41cfed37b7 Fixed a few crashes 2015-04-03 20:21:05 -04:00
Aidan C. Brady
63f751c710 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2015-04-03 10:14:33 -04:00
Aidan
6780d7fd72 Merge pull request #2448 from mymagadsl/patch-4
Update zh_TW.lang
2015-04-02 15:18:22 -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
Aidan
20a91e655f Merge pull request #2439 from Vexatos/patch-8
Update de_DE.lang
2015-04-01 13:10:30 -04:00
Aidan
e3e604f999 Merge pull request #2440 from Vexatos/patch-9
Fixed en_US.lang
2015-04-01 13:10:12 -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
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
1a46bb5201 Merge pull request #2424 from Vexatos/patch-7
Fixed Mekanism API
2015-03-31 09:38:42 -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
Aidan
fb54965572 Merge pull request #2411 from Mr-tanaka3/master
Update ja_JP.lang
2015-03-29 10:11:05 -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