Commit Graph
4065 Commits
Author SHA1 Message Date
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
Aidan b6bbd85d3d Merge pull request #4240 from JaSpr/feature/fix-#4233
Fix for #4233: out-of-bounds error in thermal evaporation render, which crashes client.
2017-03-08 18:49:18 -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
Aidan 1ff0eaa18c Merge pull request #3947 from ThatGamerBlue/master
add gradle binaries
2017-01-11 13:21:15 -05:00
Aidan d2389f0b87 Merge pull request #4104 from TartaricAcid/master
Update zh_CN file
2017-01-11 13:20:57 -05:00
Aidan bd2f5d5f40 Merge pull request #4136 from ThatGamerBlue/patch-1
make christmas.... on christmas
2017-01-11 13:20:20 -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
TartaricAcid dfc250c322 Fix a little error 2017-01-06 14:43:42 +08:00
Tom Elfring a0f5360147 Fix unsave cast in Atomic Disassembler - fixes #4120 2017-01-04 13:36:23 +01:00
TartaricAcid 57e2ef0e17 Fix some errors 2017-01-02 11:08:23 +08:00
TartaricAcid 17b1004649 Update zh_CN file 2016-12-30 22:43:51 +08: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
Xander c0afbc8fd8 add simulate support to TileEntityBin.add/remove & backwards compatible versions with no simulate parameter 2016-12-03 17:32:20 +08:00
aidancbrady c510ce7d8c Merge branch '1.7.10' into 1.10
* 1.7.10:
  Added version-based handling, bump version to 9.1.1
  Bump up Dynamic Tank max storage, fixed Factory container issue
  Add config option to disable block protections
  Fixed chunk churning issue with frames
  Restrict Thermal Evaporation Plant output to needed
  Going back to MIT, thanks to the concerns of @bshelden and @asiekierka

Conflicts:
	build.properties
	src/main/java/mekanism/api/MekanismConfig.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/ThreadGetData.java
	src/main/java/mekanism/common/block/BlockBounding.java
	src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
	src/main/java/mekanism/common/item/ItemBlockGasTank.java
	src/main/java/mekanism/common/item/ItemBlockMachine.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java
	src/main/java/mekanism/tools/common/MekanismTools.java
2016-11-27 13:33:57 -05:00
Aidan fadbb16a86 Merge pull request #3652 from clienthax/1.7.10
Add config option to disable block protections
2016-11-27 13:28:18 -05:00
Aidan 8eb66e22f7 Merge pull request #3994 from thommy101/issue3991
Remove deploader, depend on MCMP fixes #3991
2016-11-27 13:24:36 -05:00
aidancbrady 29e57462ee Merge branch '1.10' of https://github.com/aidancbrady/Mekanism into 1.10
# By Tom Elfring
# Via GitHub (2) and Tom Elfring (1)
* '1.10' of https://github.com/aidancbrady/Mekanism:
  Fix breaking of Glow Panels
  Fix for issue #3887
  Fix for issue 3954
2016-11-25 12:25:30 -05:00
aidancbrady 459cdc67e8 Crash fixes! 2016-11-25 12:25:26 -05:00
Aidan 86540e4891 Merge pull request #3967 from thommy101/issue3887
Fix breaking of cables and glow panel, fixes #3887
2016-11-25 12:03:48 -05:00
Aidan 6282f2b6f4 Merge pull request #3958 from thommy101/issue3954
Fix for issue #3954
2016-11-25 12:03:24 -05:00
Tom Elfring 8450aeb548 Remove deploader, depend on MCMP fixes #3991 2016-11-21 14:40:54 +01:00
Tom Elfring aa4d5e90f1 Fix breaking of Glow Panels 2016-11-14 19:12:57 +01:00
ThatGamerBlue e183fc8744 Merge pull request #2 from thommy101/issue3954
Issue3954
2016-11-13 19:42:25 +00:00
ThatGamerBlue 4d5b1e4d77 Issue3887 (#1)
* Fixed gas auto-output

* Fixed Dynamic Tank logic issue, changed transmitter redstone sensitivity to off by default

* Fixed tesla crash

* Bump version to 9.2.1

* Add a check to prevent render exception

* Increase MCMP version to latest

* Account for meta in the JEI ISubtypeInterpreter

I think an old JEI was using meta + the `ISubtypeInterpreter`, but it was not intended, and JEI does not do that now.
Right now, if you look up Mekanism stuff in JEI it shows all kinds of blocks instead of just the intended block.
This PR fixes the Mekanism `ISubtypeInterpreter` so that it differentiates machines and basic blocks again.

* Fixed homeLocation write

* Fix for issue #3887
2016-11-13 19:41:32 +00:00
Tom Elfring 12c3d17b2d Fix for issue #3887 2016-11-12 13:33:05 +01:00