Commit Graph
1982 Commits
Author SHA1 Message Date
aidancbrady 4c8e9fcb35 Block bounds for Laser and Logistical Sorter 2017-04-29 15:04:23 -04:00
aidancbrady c4b4669600 Fixed fluid item handling 2017-04-29 13:32:02 -04:00
aidancbrady 92e1f12cd5 Fixed Resistive Heater computer integration 2017-04-29 12:46:43 -04:00
aidancbrady 313ae0112e Fixed potential Robit crashes 2017-04-29 12:39:25 -04:00
aidancbrady d93f0e383a Fixed import issue 2017-04-28 17:37:56 -04:00
aidancbrady 4fe8a2bfec Merge branch '1.10' into 1.11
* 1.10:
  Allow axe specific enchantments on axe
2017-04-28 17:26:17 -04:00
aidancbrady 98a0b2aa81 Fixed Digital Miner dupe bug 2017-04-28 16:59:52 -04:00
aidancbrady 8d66d4b973 Added "Allow Default" option to transporter filters to allow prevention of default route 2017-04-28 16:43:00 -04:00
aidancbrady 2b37fdb69f Fix Atomic Disassemblers for good 2017-04-28 15:18:58 -04:00
aidancbrady e0229d2815 Add missing tooltip to Thermodynamic Conductor 2017-04-28 14:58:44 -04:00
aidancbrady 21c49c1643 Advanced item handing, adding inventory-searching to basic item ejection- no longer will items get jammed
Also, fixed transmitter tooltips
2017-04-28 14:54:26 -04:00
aidancbrady 8a65923dc6 Add stock control to Formulaic Assemblicator 2017-04-28 02:53:53 -04:00
aidancbrady b0dd7a10e7 Added configurable portable teleport delay 2017-04-28 00:50:30 -04:00
aidancbrady bacd97f44a Add sanity check to turbine 2017-04-28 00:06:23 -04:00
aidancbrady bb473a3100 Fixes 2017-04-27 23:02:23 -04:00
aidancbrady 808f0cdf8a More refactoring, gave Rotary Condensentrator and Electrolytic Separator sound effects. Need to fix bugs 2017-04-27 22:51:44 -04:00
aidancbrady 2c161ed4ce Better machine hierarchy to avoid repetition 2017-04-27 22:00:59 -04:00
aidancbrady b3621cd511 Cap at max energy after energy upgrade removal 2017-04-27 20:53:06 -04:00
aidancbrady 61e024b8e8 Fixed Digital Miner bound issue 2017-04-27 16:34:09 -04:00
Aidan 9c7ec4d6ad Merge pull request #4313 from thommy101/issue-4122-v2
Allow axe specific enchantments on axe
2017-04-27 16:14:01 -04:00
aidancbrady 009cca7b92 Fix atomic disassembler offhand interaction 2017-04-27 16:09:09 -04:00
aidancbrady 703974b9e8 Fixed turbines not showing up 2017-04-27 15:27:10 -04:00
aidancbrady eb5352bafc Merge branch '1.10' into 1.11
* 1.10:
  Better OpenComputers compat.
2017-04-27 13:42:44 -04:00
Aidan ad6d509fcc Merge pull request #4282 from marcin212/OCGasTankDriver
Better OpenComputers compat.
2017-04-27 13:34:02 -04:00
aidancbrady 2848b6fa47 Computer integration fixes 2017-04-27 13:33:55 -04:00
aidancbrady 3511bfae31 Fixed Robit client sync 2017-04-27 13:14:55 -04:00
Aidan ca4a49ba0f Merge pull request #4346 from thommy101/issue-4342
Fix more UUID changes. Fix Robit owner.
2017-04-27 13:10:45 -04:00
aidancbrady 0b3157ea18 Cleanup 2017-04-27 13:09:35 -04:00
aidancbrady 75a1793848 Merge branch '1.10' into 1.11
* 1.10:
  Add scroll wheel support for GuiScrollList (and empty super on GuiElement)
2017-04-27 12:51:28 -04:00
Xander Victory a85d41b49a Add scroll wheel support for GuiScrollList (and empty super on GuiElement) 2017-04-27 14:04:03 +08:00
aidancbrady e85f9ebd73 Computer support for Turbine Valve 2017-04-26 16:29:23 -04:00
aidancbrady 924392df2e Add computer support to Boiler Valve 2017-04-26 15:45:46 -04:00
Tom Elfring 035ddfc801 More missing UUID changes 2017-04-26 19:24:48 +02:00
Tom Elfring f493221381 Fix more UUID changes. Fix Robit owner.
Fixes: #4342 and #4345.
2017-04-26 18:50:46 +02:00
aidancbrady 1c31d9c2d3 Fix minor NBT glitch 2017-04-26 12:44:38 -04:00
aidancbrady 69cad9dade Fixed box blacklist 2017-04-24 23:57:49 -04:00
aidancbrady 859186f766 cleanup 2017-04-24 14:32:09 -04:00
aidancbrady 3f9bde420d Merge branch '1.10' into 1.11
* 1.10:
  Change gastank to non full cube.
2017-04-24 14:31:22 -04:00
aidancbrady 8ae57bd9af Remove teleporter command, deprecated and silly 2017-04-24 14:23:07 -04:00
aidancbrady 6f2b84e547 Totally refactor frequencies to use UUIDs instead of player usernames 2017-04-24 14:15:43 -04:00
aidancbrady b72740cffd Add comprehensive computer integration to Logistical Sorter 2017-04-24 10:44:31 -04:00
aidancbrady a892f64e3a Fix fluid handler item-world interaction 2017-04-22 14:44:24 -04:00
aidancbrady a9d438c962 Fixed Quantum Entangloporters 2017-04-22 14:36:04 -04:00
aidancbrady 796c9e502a IItemHandler finishing touches. I think we're home free! 2017-04-21 14:51:17 -04:00
aidancbrady ccb342ead7 Fixed inventory pull overshooting 2017-04-20 20:14:59 -04:00
Tom Elfring 0392f550dc Allow pipes to connect to IItemHandlers
Allow pipes to connect to IItemHandler capability items and allow extraction from it. Insertion not yet working
2017-04-20 20:36:03 +02:00
Aidan 07544f4eeb Merge pull request #4331 from thommy101/issue-4304
Fix saltgen offset
2017-04-20 10:59:29 -04:00
Tom E b6ff755da3 Fix saltgen offset
Fixes #4304.
2017-04-20 14:02:05 +02:00
aidancbrady b97b7184c1 Completely refactor inventory management to allow IItemHandler support. Likely many bugs to fix, but it's a start 2017-04-19 16:16:09 -04:00
aidancbrady 840de86d11 Merge branch '1.11' of https://github.com/aidancbrady/Mekanism into 1.11
# By Tom Elfring
# Via GitHub (2) and Tom Elfring (1)
* '1.11' of https://github.com/aidancbrady/Mekanism:
  Fix null Itemstacks in miner and recipes
  Fix IMC recipe removal
2017-04-19 10:35:46 -04:00