Commit Graph
629 Commits
Author SHA1 Message Date
Aidan C. Brady de5cc8c76d Merge fix changes 2014-11-16 11:45:05 -05:00
Aidan C. Brady 53b5a25558 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
2014-11-16 01:08:08 -05:00
Aidan C. Brady ebb23fbfea Merge branch 'master' into development 2014-11-16 01:06:44 -05:00
Aidan C. Brady 5be57a20d6 Attempt a fix at an API bug 2014-11-16 01:06:00 -05:00
Aidan C. Brady 1b159d3242 Another cleanup 2014-11-16 01:00:41 -05:00
Aidan C. Brady 607eb31316 A few minor cleanups 2014-11-15 18:46:11 -05:00
Ben Spiers 2507bd3ecb Fix some merge dodginess. 2014-11-13 22:18:26 +00:00
Ben Spiers c5e8c866ce Fix me being stupid. #1943 2014-11-13 19:46:41 +00:00
Ben Spiers 6872279a0e Stop UniCables claiming to carry MJ 2014-11-13 19:46:21 +00:00
Ben Spiers ece8c6eb08 Only receive RF from sides in NORMAL mode.
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
2014-11-13 19:45:58 +00:00
Ben Spiers 224d778155 Make PULL mode actually, and exclusively, pull.
Conflicts:
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
2014-11-13 19:43:05 +00:00
Ben Spiers b31aa92844 Update lots of APIs, most notably BC and an actual 1.7 version of CC
Conflicts:
	build.properties
	src/api/java/buildcraft/api/core/BlockIndex.java
	src/api/java/buildcraft/api/core/BuildCraftAPI.java
	src/api/java/buildcraft/api/fuels/IFuel.java
	src/api/java/buildcraft/api/mj/BatteryObject.java
	src/api/java/buildcraft/api/mj/IBatteryIOObject.java
	src/api/java/buildcraft/api/mj/IBatteryObject.java
	src/api/java/buildcraft/api/mj/IOMode.java
	src/api/java/buildcraft/api/mj/MjAPI.java
	src/api/java/buildcraft/api/mj/MjBattery.java
	src/api/java/buildcraft/api/power/PowerHandler.java
	src/api/java/buildcraft/api/recipes/CraftingResult.java
	src/api/java/buildcraft/api/recipes/IAssemblyRecipeManager.java
	src/api/java/buildcraft/api/recipes/IFlexibleRecipe.java
	src/api/java/buildcraft/api/recipes/IRefineryRecipeManager.java
	src/api/java/buildcraft/api/transport/IPipe.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FuelHandler.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/base/IAdvancedBoundingBlock.java
	src/main/java/mekanism/common/multipart/MultipartMekanism.java
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/common/multipart/PartUniversalCable.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/common/tile/TileEntityAdvancedBoundingBlock.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/CableUtils.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/common/util/TransporterUtils.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
	src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
2014-11-13 19:30:39 +00:00
Ben Spiers 64d0f8a5cc Merge branch 'master' into development 2014-11-11 12:52:27 +00:00
Ben Spiers 3a805bd948 Fix me being stupid. #1943 2014-11-11 12:51:28 +00:00
Ben Spiers a0c492862f Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
2014-11-11 12:37:57 +00:00
Ben Spiers 8f6b24ba67 Stop UniCables claiming to carry MJ 2014-11-11 12:27:03 +00:00
Ben Spiers 0d21d201a9 Only receive RF from sides in NORMAL mode. 2014-11-11 12:25:58 +00:00
Ben Spiers 92f1579bba Make PULL mode actually, and exclusively, pull. 2014-11-11 12:25:10 +00:00
Ben Spiers 5b4f154040 Giant optimise imports. 2014-11-10 21:53:29 +00:00
Ben Spiers 4d1c1285b2 Update lots of APIs, most notably BC and an actual 1.7 version of CC 2014-11-10 21:51:37 +00:00
Aidan C. Brady 3abf36ef14 Fixes to config GUI, added new localization 2014-11-07 12:52:45 -05:00
Aidan Brady 0cccaaa415 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/multipart/ItemGlowPanel.java
2014-10-26 15:28:28 -04:00
Aidan Brady aa103e28da Minor cleanup 2014-10-26 15:20:52 -04:00
Aidan Brady c1f5b65cf5 Merge branch 'master' into development 2014-10-26 15:20:10 -04:00
Aidan Brady 1b665d99e2 Fixed a Portable Tank crash 2014-10-26 15:19:00 -04:00
Aidan C. Brady 10107678d1 Fixed strange glow panel issue 2014-10-17 12:03:42 -04:00
Aidan C. Brady 60bf7f5f3d Merge branch 'development' into 1.8 (gosh darn conflicts)
Conflicts:
	src/api/java/ic2/api/Direction.java
	src/api/java/ic2/api/energy/NodeStats.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/block/BlockMachine.java
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
	src/main/java/mekanism/common/util/MekanismUtils.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2014-10-17 12:00:39 -04:00
Aidan C. Brady d0a62c564e Merge branch 'master' into development 2014-10-17 11:48:02 -04:00
Tonius fc83b1b837 Added NEI usage handler for infusion objects 2014-10-05 19:23:53 +02:00
Ben Spiers 92a5929c28 That was not a statement. 2014-10-02 22:16:29 +01:00
Ben Spiers 4f41f5a1df Prevent IC2 double-outputting. 2014-10-02 18:54:30 +01:00
Ben Spiers f0b7f342b8 ElectricBlocks now output to IC2 properly. 2014-10-02 18:54:30 +01:00
Ben Spiers 3c715d906b Shuffle up EnergyNet support a bit.
Remove the ENet's TileEntity instead of the world's one, and remove the existing one if one exists when adding the current one. Also move registration to on first tick to hopefully avoid adding too early issues. This is when IC2's delegates register so should be relatively foolproof.
Conflicts:
	src/main/java/mekanism/common/tile/TileEntityElectricBlock.java
2014-10-02 18:54:30 +01:00
Ben Spiers b25d8f673b Only use the EnergyNet-related interfaces if IC2 itself is loaded.
Also add some extra safety to useIC2().
Conflicts:
	src/main/java/mekanism/common/util/MekanismUtils.java
2014-10-02 18:54:30 +01:00
Aidan C. Brady ed8823b038 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
2014-10-02 12:47:22 -04:00
Aidan C. Brady 65ea389118 Merge branch 'master' into development 2014-10-02 11:22:31 -04:00
Aidan 26dadfe176 Merge pull request #1876 from sk89q/oredictcache-fix
Fix some performance issues with OreDictCache
2014-10-02 11:16:47 -04:00
TheJulianJES ea42e52973 Fix > 3D Bow Bug 2014-10-01 17:30:32 +02:00
sk89q 16fc882da7 Change OreDictCache to hit the hash map one fewer time. 2014-09-30 13:26:34 -07:00
sk89q 125ac34c01 Use object default hashCode in ItemInfo for Item.
Also change the hashCode() algorithm slightly.
2014-09-30 13:24:00 -07:00
sk89q 3f6c87d8f5 Fix ItemInfo.equals() not functioning as intended. 2014-09-30 13:24:00 -07:00
Ben Spiers 5d08726880 Add config options to blacklist the different power systems.
This should help people avoid IC2 problems with console spam, but such a "solution" only relieves the most obvious symptom of chunk-thrashing, it doesn't stop the thrashing itself.
2014-09-30 20:40:18 +01:00
Ben Spiers 417b072c66 Hopefully stop corruption hitting gas tanks. 2014-09-30 20:24:04 +01:00
Ben Spiers e7f3204ed7 Fix a tesseract fluid issue. 2014-09-30 20:24:04 +01:00
Aidan C. Brady c01212aae1 Merge branch 'development' into 1.8
Conflicts:
	src/main/java/mekanism/generators/common/MekanismGenerators.java
2014-09-27 15:23:31 -04:00
Aidan C. Brady 94108d3e37 Made MekGen recipes more OreDict friendly 2014-09-27 15:19:53 -04:00
Aidan C. Brady 9eb9eab91d Added in a fun little silk touch multiplier config 2014-09-27 15:07:55 -04:00
Aidan C. Brady 521f7d7853 Cleanup 2014-09-27 14:44:13 -04:00
Aidan C. Brady 9bf4baab49 Merge branch 'development' into 1.8 (hopefully I didn't miss anything)
Conflicts:
	src/main/java/mekanism/client/gui/GuiGasTank.java
	src/main/java/mekanism/client/gui/GuiPortableTeleporter.java
	src/main/java/mekanism/client/gui/GuiTeleporter.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/content/transporter/TransporterStack.java
2014-09-27 14:40:25 -04:00
Aidan C. Brady cde5755ee3 Fixed an import 2014-09-27 14:09:13 -04:00