Commit Graph
162 Commits
Author SHA1 Message Date
Vexatos f4ec705b32 Fixed Mekanism API 2015-03-31 15:11:45 +02:00
Aidan C. Brady e4d624d8ab Fancy new eject algorithms, should fix issues with PRC 2015-03-30 19:27:54 -04:00
Aidan C. Brady af48daf73b When multiblenetworks of differing fluids/gasses merge, replace one, don't add up the total gas 2015-03-30 00:21:42 -04:00
Aidan C. Brady 9b1aa2099b Started work on Reactor Logic Adapters 2015-03-29 12:50:15 -04:00
Aidan C. Brady 07d0c2bfc1 Hopefully fixed negative buffer issue 2015-03-27 17:09:23 -04:00
Aidan C. Brady fba7fb34f0 Fixed ItemRetriever 2015-03-27 12:49:29 -04:00
Aidan C. Brady 7afef3f8ee Fixed an API issue, implemented new default icon system to allow for dynamic factory icons based on recipe type 2015-03-26 17:10:32 -04:00
Aidan C. Brady f6f75e6ea1 Crash fix 2015-03-23 22:00:43 -04:00
Aidan C. Brady 4354357462 Added a null check 2015-03-22 21:41:59 -04:00
Aidan C. Brady 735217961c Fixed Configurator tooltip, fixed a major packet issue 2015-03-22 21:40:23 -04:00
Ben Spiers 0064f09d8c Backwards-compatibility for IGasHandler. #2267 2015-03-22 14:36:21 +00:00
Ben Spiers c0281d4470 Fix #2298 2015-03-22 02:23:45 +00:00
Aidan C. Brady 79d319cc87 Fixed temperature units 2015-03-21 11:51:11 -05:00
Aidan C. Brady 39621a74b1 Added config to display profiled portable tanks 2015-03-20 22:46:26 -05:00
Aidan C. Brady 82c355cb86 Added a null check for transitions 2015-03-20 17:37:22 -05:00
Aidan C. Brady e92f2654de API finalization, all set for release. 2015-03-20 14:18:18 -04:00
Ben Spiers b69e6a9d80 Make temperatures consistent. 2015-03-19 16:41:07 +00:00
Ben Spiers d560ea91a8 Move lighting config to general.
Hopefully fixes whatever weird issue was going on before.
2015-03-19 12:47:36 +00:00
Aidan C. Brady f9c10d9012 More work on teleporters, implemented chunkloading 2015-03-12 22:55:37 -05:00
Aidan C. Brady 6d36926866 Work on Portable Teleporter, need to fix the screwed up GUI 2015-03-12 16:52:04 -05:00
Aidan C. Brady d4d7e88c4e Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration.
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
2015-03-07 19:09:23 -05:00
Aidan C. Brady ff91bf72fe Added new "machines" section to config - specifically enable or disable any core Mekanism machinery, including options to remove already-existing machinery from worlds 2015-03-05 13:48:01 -05:00
Aidan C. Brady 6f0cf3a166 Fixed many bugs!
- Asset issue with Dynamic Valve fixed
- Fixed pipes connecting to Dynamic Valves when not part of structure
- Fixed stack overflow when rendering valve fluids
- Fixed transmitter networks considering pull-based block connections as acceptor connections
- Fixed dynamic tanks maintaining a fluid type even when it has been depleted
- Fixed "clearIfNecessary()" transmitter calls not working
2015-03-04 20:01:46 -05:00
Aidan C. Brady b2e532964c Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/item/ItemAtomicDisassembler.java
	src/main/java/mekanism/common/network/PacketConfigSync.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
2015-03-04 14:30:05 -05:00
Ben Spiers f2859cacbb Rename EnergyUtils to UnitDisplayUtils 2015-02-27 17:33:14 +00:00
Ben Spiers fa9588d557 Add a proper temperature display utility 2015-02-27 17:33:14 +00:00
Aidan C. Brady 5767bfb22e Work on Solar Neutron Activator and its recipe system 2015-02-26 17:23:53 -05:00
Aidan C. Brady f5dadf443a Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
2015-02-25 09:16:54 -05:00
Aidan C. Brady bf42f71b8e Fixed a few crashes 2015-02-25 09:15:08 -05:00
Aidan C. Brady 62791baec7 Solar Evaporation Plant fixes 2015-02-24 14:11:26 -05:00
Aidan C. Brady 888d1bdad8 Deuterium production is complete - use heavy water electrolysis instead of centrifuge recipe 2015-02-24 10:59:03 -05:00
Aidan C. Brady 25df777b84 Work on fusion fuel creation mechanics, allowed Chemical Washer to accept upgrades 2015-02-17 21:27:35 -05:00
Aidan C. Brady 548145ae02 Revert "Revert "Fix some transmitter issues.""
This reverts commit e9ef6c1866.
2015-02-16 17:24:51 -05:00
Aidan C. Brady e9ef6c1866 Revert "Fix some transmitter issues."
This reverts commit f63807c75a.
2015-02-16 17:21:39 -05:00
Aidan C. Brady 3561f9fe59 Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java
	src/main/java/mekanism/tools/common/MekanismTools.java
2015-02-16 14:40:10 -05:00
Aidan C. Brady 2796a5d67b Merge branch 'master' into development
Conflicts:
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
2015-02-12 13:10:55 -05:00
Ben Spiers 7e08643ebd ConcurrentHashMaps don't like null keys 2015-02-12 16:59:39 +00:00
Ben Spiers e6a4d3efb2 Screw it, let's just make these concurrent.
Keeping transmitters as a synchronizedSet-wrapped LinkedHashSet for now, because there isn't a ConcurrentLinkedHashSet.
2015-02-12 16:39:48 +00:00
Aidan C. Brady 50f7df5f98 Merge branch 'development' into v8
Conflicts:
	build.properties
	src/main/java/mekanism/api/gas/GasNetwork.java
	src/main/java/mekanism/api/transmitters/DynamicNetwork.java
	src/main/java/mekanism/client/ClientTickHandler.java
	src/main/java/mekanism/common/EnergyNetwork.java
	src/main/java/mekanism/common/FluidNetwork.java
	src/main/java/mekanism/common/Mekanism.java
	src/main/java/mekanism/common/recipe/RecipeHandler.java
	src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java
	src/main/java/mekanism/generators/common/MekanismGenerators.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 18:39:15 -05:00
Aidan C. Brady d8e12ca8d2 Merge branch 'development' into v8
Conflicts:
	src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
	src/main/java/mekanism/generators/common/block/BlockGenerator.java
2015-02-10 11:38:13 -05:00
Ben Spiers 4b75a2f6a2 Hopefully improve the synchronization of the networks' transmitter sets 2015-01-07 23:13:10 +00:00
Ben Spiers f63807c75a Fix some transmitter issues. 2014-12-27 21:09:34 +00:00
Ben Spiers d4f48401d3 Merge branch 'development' into v8 2014-12-22 23:46:17 +00:00
Ben Spiers c77e84ca6c Make cyan brighter 2014-12-22 23:41:33 +00:00
Ben Spiers 37e35d5943 Make loading the reactor from file update the "last" temperatures. 2014-12-22 23:40:03 +00:00
Ben Spiers 7296c3dbcb Reactors now a Heat source. Awaiting Balance. 2014-12-22 21:30:45 +00:00
Ben Spiers 8a4aaff44a Move standard simulation method into a Utils class. 2014-12-22 19:38:03 +00:00
Ben Spiers ab2a7cb6c7 Improve temperature colours to allow for different base colours.
Make a start on insulation.
Code the characteristics of air into static IHeatTransfer variables.
2014-12-22 19:14:55 +00:00
Ben Spiers bb937fdd53 Heat Transmission. 2014-12-19 04:46:23 +00:00
Ben Spiers b5f3d77b83 Making a start on Gas Centrifuge. 2014-12-19 02:23:42 +00:00