Ben Spiers
7a2461540f
Merge branch 'development' into networkRefactor.
...
Hopefully I didn't miss anything
Conflicts:
src/main/java/mekanism/api/gas/GasNetwork.java
src/main/java/mekanism/client/render/RenderPartTransmitter.java
src/main/java/mekanism/common/EnergyNetwork.java
src/main/java/mekanism/common/FluidNetwork.java
src/main/java/mekanism/common/InventoryNetwork.java
src/main/java/mekanism/common/content/transporter/TransporterStack.java
src/main/java/mekanism/common/multipart/PartHeatTransmitter.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
src/main/java/mekanism/common/multipart/PartSidedPipe.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/common/util/PipeUtils.java
2015-04-03 19:45:25 +01:00
Ben Spiers
d14686ea2e
Work on clientsiding, acceptors and things like redstone and multipart blocking.
2015-04-02 03:22:53 +01:00
Aidan C. Brady
f9070f33d0
Fixed Induction Matrix not outputting properly
2015-03-24 21:43:22 -04:00
Ben Spiers
01f37e552e
Make induction ports work with connected textures.
2015-03-17 23:49:45 +00:00
Ben Spiers
71a9bfc4f9
Make the @Optional removals stricter.
...
Require IC2, BC or CoFHCore to be loaded in order to use their respective APIs. Remove all the individual mod deps to prevent us depending on mods that depend on us.
2015-03-16 15:48:19 +00:00
Aidan C. Brady
9260414177
Finished implementing Induction Matrix core functionality, just about everything works! Need to redesign GUI to include separate gauge for output rate
2015-03-03 18:18:32 -05:00
Aidan C. Brady
2ed43e5328
More work. @unpairedbracket, I wasn't able to get connected textures to work with my Induction Ports - would you mind taking a look at the code?
...
The ports have an "output" and "input" mode with different textures, you can change the mode by shift-right clicking the port with a configurator. For some reason, no matter what I do, only the input texture is shown when I use the ctm system. For now I am using default block textures, but CTM textures are much preferred!
2015-03-03 16:42:50 -05:00
Aidan C. Brady
8d3dfc0c2c
Work on EIM interface
2015-03-03 13:16:58 -05:00
Aidan C. Brady
562352d54c
EIM work
2015-03-03 11:41:46 -05:00
Aidan C. Brady
978e0801fa
More work on EIM. Found some inconsistency/incomplete mechanics in the new multiblock system, no longer should be an issue
2015-03-03 00:15:18 -05:00
Aidan C. Brady
1c0fe96fed
Energized Induction Matrix work!
2015-03-02 23:05:54 -05:00
