Commit Graph
1896 Commits
Author SHA1 Message Date
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
aidancbrady b4c5cf73a9 Fixed Quantum Entangloporters 2017-03-29 18:48:49 -04:00
aidancbrady 2071cb3760 Fix multipart breaking 2017-03-29 18:44:41 -04:00
aidancbrady 3fccbada96 Fixed some multipart crashes 2017-03-29 17:38:40 -04:00
aidancbrady 0baf510473 Fixed Hohlraum damage bar, fixed multiblock inventory modification, better volume maintenance, fixed fluid items, crash fixes 2017-03-29 17:20:34 -04:00
aidancbrady c12f1c1e6f Add IItemHandler support to (most) blocks, fixed machines rotating (thanks @Ricket) 2017-03-29 13:51:00 -04:00
aidancbrady 0e9f380bd7 Forge Energy support, added full functionality for Tesla 2017-03-29 12:56:20 -04:00
aidancbrady 5cea9502cb Fixed silk touch drops of miner 2017-03-29 10:55:50 -04:00
aidancbrady bfef18c0d3 Fixed Logistical Transporter packet issue, fixed JEI crashes 2017-03-29 10:23:08 -04:00
aidancbrady afd3525a4b Even more inventory changes 2017-03-29 01:33:04 -04:00
aidancbrady 01ab160ff9 Transition from null stacks to ItemStack.EMPTY 2017-03-29 01:08:36 -04:00
aidancbrady fa7b9b49bc Fix glow panel placement, fixed damage displays (again), start work on new inventory system 2017-03-28 23:21:06 -04:00
aidancbrady 2aad738c3d Temporarily disable multipart functionality, got transmitters to work, reorganize multipart code 2017-03-28 22:49:29 -04:00
aidancbrady 89905c836b Fix runtime texture errors, fixed JEI errors, fixed damage display, fixed naming 2017-03-28 22:04:33 -04:00
aidancbrady c89d7d49b9 Bump version, temporary asset purge 2017-03-28 21:04:58 -04:00
aidancbrady 2f705768e4 Work on overhaul of transmitters 2017-03-28 19:32:32 -04:00
aidancbrady 6a42eb64e3 Update to 1.11.2. Untested, still using outdated MCMP 2017-03-25 20:35:26 -04:00
aidancbrady 2b02042f4c Bump version for release 2017-03-24 11:28:26 -04:00
aidancbrady dd857d6617 Add necessary null check 2017-03-24 11:23:19 -04:00
aidancbrady 77287cbbcd Check simulation parameters in Tesla integration 2017-03-24 11:17:27 -04:00
aidancbrady c073bcaedd Fix filters not allowing apostrophe 2017-03-24 11:05:49 -04:00
aidancbrady 82a4c282b4 Fix key handler crash, allow underscore in Logistical Sorter interface, fix mod ID lookup crash 2017-03-22 19:37:00 -04:00
aidancbrady ab5b5deb23 Several Tesla fixes 2017-03-08 19:01:43 -05:00
aidancbrady db2751c84d Fix cardboard box crash 2017-03-08 18:57:16 -05:00
aidancbrady c96d13a2e6 Merge branch 'master' into 1.10
* master:
  Added compressed diamond, obsidian, and redstone to the ore dictionary.
2017-03-08 18:54:19 -05:00
Aidan a99a3a93a5 Merge pull request #4237 from JaSpr/feature/compressed-item-ore-dictionary-entries
Added compressed diamond, obsidian, and redstone to the ore dictionary.
2017-03-08 18:54:02 -05:00
aidancbrady 41c4764f37 Add Draconium to minor compat 2017-03-08 18:53:32 -05:00
aidancbrady b5aec3bd18 Merge branch 'master' into 1.10
* master:
  Fix for #4233, in which thermal evaporation tower was attempting to render  with contents above its max capacity, causing out-of-bounds error that crashed client.
2017-03-08 18:49:39 -05:00
aidancbrady c62ef9ff9d Make Brine a liquid 2017-03-08 18:49:15 -05:00
Jason Spradlin 49d7306fca Fix for #4233, in which thermal evaporation tower was attempting to render with contents above its max capacity, causing out-of-bounds error that crashed client. 2017-02-25 09:08:57 -06:00
Jason Spradlin 328e5bb993 Added compressed diamond, obsidian, and redstone to the ore dictionary. 2017-02-25 02:48:24 -06:00
aidancbrady 33aed2341a Add uranium to minor compat 2017-02-12 14:27:02 -05:00
aidancbrady 35d1b4f755 Fix armor balance order 2017-02-12 13:57:03 -05:00
aidancbrady 98f57257e9 Fix #4192 2017-02-11 16:19:48 -05:00
aidancbrady 99abef573c Merge branch '1.10' of https://github.com/aidancbrady/Mekanism into 1.10
# By Tom Elfring
# Via GitHub (3) and Tom Elfring (1)
* '1.10' of https://github.com/aidancbrady/Mekanism:
  Fix unsave cast in Atomic Disassembler - fixes #4120
  Fix Turbine not returning energy capability
  Do not extract steam as a gas from a reactor, it is not registred as a gas.
2017-02-11 16:07:45 -05:00
aidancbrady 949df71a77 Allow for sword repairability 2017-02-11 16:07:41 -05:00
Aidan a959bd6135 Merge pull request #4124 from thommy101/issue-4120
Fix unsave cast in Atomic Disassembler - fixes #4120
2017-02-11 16:00:38 -05:00
Aidan 4d5ac6535f Merge pull request #4072 from thommy101/issue4067
Do not extract steam as a gas from a reactor - Fixes #4067
2017-02-11 15:59:49 -05:00
Aidan 001ff74d92 Merge pull request #4103 from thommy101/issue-4097
Fix turbine not returning energy capability - Fixes #4097
2017-02-11 15:59:14 -05:00
aidancbrady 7e3c806a8f Merge branch 'master' into 1.10
* master:
  make christmas.... on christmas
  Fix a little error
  Fix some errors
  Update zh_CN file
  add subclass for IItemHandler, allowing other blocks to access the DSU-type stored contents - uses add/remove methods, supersedes DSU interface(s)
  add simulate support to TileEntityBin.add/remove & backwards compatible versions with no simulate parameter
  Issue3887 (#1)
  add gradle binaries
2017-01-13 13:10:10 -05:00
Aidan 0344c4be76 Merge pull request #4128 from thommy101/issue-3954 2017-01-12 12:07:09 -05:00
Tom E 78bbb4b522 Fixed missing plastic colour state 2017-01-11 19:51:47 +01:00
Aidan 536dab7239 Merge pull request #4035 from thiakil/BinItemHandler
Bin IItemHandler
2017-01-11 13:31:11 -05:00
ThatGamerBlue ae4114e2c3 make christmas.... on christmas 2017-01-08 18:29:21 +00:00
Tom E 0c3b705e28 Fix wrong fence color - Fixes #3954
Missed a color meta state with the plastic fence.
2017-01-06 14:52:38 +01:00
Tom Elfring a0f5360147 Fix unsave cast in Atomic Disassembler - fixes #4120 2017-01-04 13:36:23 +01:00
Tom Elfring cf601d4fdc Fix Turbine not returning energy capability 2016-12-30 15:22:07 +01:00
Tom Elfring 70b9c5de2e Do not extract steam as a gas from a reactor, it is not registred as a gas. 2016-12-17 16:51:01 +01:00
Xander 2d4481d17d add subclass for IItemHandler, allowing other blocks to access the DSU-type stored contents - uses add/remove methods, supersedes DSU interface(s) 2016-12-03 17:33:47 +08:00