Commit Graph
1945 Commits
Author SHA1 Message Date
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
aidancbrady 20f6351d47 Fixed JEI issues 2017-04-19 10:35:42 -04:00
Aidan 7117ab04bf Merge pull request #4322 from thommy101/issues-4321-4319
Fix null Itemstacks in miner and recipes
2017-04-19 10:25:33 -04:00
Aidan b1d587a892 Merge pull request #4320 from thommy101/issue-imc_recipe_removal
Fix IMC recipe removal
2017-04-19 10:24:46 -04:00
aidancbrady 9dbc3bada2 Fixed pipe crash 2017-04-19 10:17:41 -04:00
aidancbrady fb3438e726 Fixed command warning 2017-04-19 10:16:18 -04:00
Tom Elfring 704826f0fd Fix null Itemstacks in miner and recipes
Fixes #4321 and #4319
Thanks to @allanf181 for finding the recipe bug
2017-04-17 15:07:14 +02:00
Tom Elfring e0bd9ae4ab Fix IMC recipe removal 2017-04-16 14:53:05 +02:00
aidancbrady 20cf847b64 Fix java being silly 2017-04-14 11:47:57 -04:00
aidancbrady ace58996bf Fixed recipe removal 2017-04-14 11:42:42 -04:00
aidancbrady 4cb866c622 Fixed Pressurized Tube crash 2017-04-14 09:13:32 -04:00
aidancbrady 01e61cb2fa Fix digital miner GUI auto-closing 2017-04-13 17:11:07 -04:00
aidancbrady 9469a22274 Another crash fix 2017-04-13 17:08:00 -04:00
aidancbrady fceed3a074 Fixed some GUI crashes 2017-04-13 17:06:52 -04:00
aidancbrady 7cd9557157 Fix an oops 2017-04-13 16:52:58 -04:00
aidancbrady 5c14dc0bb3 Fixed fluid items 2017-04-13 16:51:21 -04:00
aidancbrady db4c262083 Fixed Pressurized Reaction Chamber and Electrolytic Separator IMC integration 2017-04-13 16:32:39 -04:00
aidancbrady c9cbb405d4 More API fixes 2017-04-13 16:15:26 -04:00
aidancbrady c7a74d239b Better MekanismGenerators config GUI, removed reactor API, better reactor recipe management 2017-04-13 14:42:25 -04:00
aidancbrady b355b80cf4 Fixed mod IDs, fixed generator recipes, added enabling/disabling of generators via config 2017-04-13 01:42:02 -04:00
aidancbrady 4adbc332f9 Fixed Seismic Reader, fixed Cardboard Box tooltip 2017-04-12 21:49:31 -04:00
Aidan 0b6bf0ab43 Merge pull request #4314 from thommy101/issue-4302
Fix missed null ItemStack logistical transporter
2017-04-12 20:24:02 -04:00
aidancbrady 4733420eee API improvements 2017-04-12 20:23:16 -04:00
Tom Elfring 1397ee88e4 Fix missed null ItemStack logistical transporter
Fixes #4302
2017-04-12 19:35:28 +02:00
aidancbrady 9db5a37d4b More ItemStack fixes, thanks @thommy101 2017-04-10 23:45:53 -04:00
aidancbrady ac8de88413 Cleanup 2017-04-10 23:29:04 -04:00
Tom Elfring 19780e5a07 Fix mcmp startup crash and missing import 2017-04-08 11:22:00 +02:00
aidancbrady 562c127647 Fix teleporter crash 2017-04-05 10:21:45 -04:00
aidancbrady 810c089040 Fix some fluid issues 2017-04-05 10:17:36 -04:00
aidancbrady 2b8ce30b57 Fix MCMP dependence for good 2017-04-05 10:10:04 -04:00
aidancbrady 0f0136b40b Fix multipart dependency 2017-04-04 20:43:02 -04:00
aidancbrady acde30dee3 More gas changes 2017-04-04 19:49:44 -04:00
aidancbrady 3d86b75da4 Better gas management 2017-04-04 19:45:51 -04:00
aidancbrady 8ae8652aff More ItemStack fixes 2017-04-03 20:17:06 -04:00
aidancbrady 6eb8e59f3c Fix more ItemStack issues 2017-04-03 20:12:02 -04:00
aidancbrady cf6a04a65d Refactored energy API to play nicely with new changes 2017-03-31 16:50:11 -04:00