Commit Graph
8 Commits
Author SHA1 Message Date
aidancbrady c9cbb405d4 More API fixes 2017-04-13 16:15:26 -04: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
Clienthax 03191f198b Add config option to disable block protections 2016-08-15 02:58:15 +01:00
Ben Spiers 8064beb0fc Fix compile errors from merge 2016-04-25 17:47:54 +01:00
aidancbrady 2838794ec3 Factory installers now maintain security 2016-04-22 07:56:15 -04:00
aidancbrady c481180088 A few bug fixes, added recipes for Security Desk 2016-03-21 19:43:03 -04:00
aidancbrady 9c480954e3 Polished security desk interface and machine interaction. Need to start integrating now, so far only complete in metallurgic infuser 2016-03-21 13:30:59 -04:00
aidancbrady 1b2aee283e Work on security framework 2016-03-19 22:03:17 -04:00