Ben Spiers
87a95e0732
Add Chlorine, do more E. Separator work, including temporary lava/brine substitute. I think it's pretty much finished for now, though maybe it could do with a new model.
2014-01-03 00:28:34 +00:00
Ben Spiers
ea96a7d747
Start work on updating the electrolytic separator. It can output both gases now! Should support recipes as well.
2014-01-03 00:28:34 +00:00
Aidan C. Brady
67d38fd179
Removed Chemical Combiner (hopefully all references)
2014-01-01 16:21:55 -05:00
Ben Spiers
a07ca18997
Change to Infuser for final stage of the contact process
2014-01-01 19:55:18 +00:00
Ben Spiers
544d96f3bc
Get most of the contact process stuff working with WIP textures and such. .langs will need updating again for new things (Chemical Combiner is a provisional name though, for the time being.)
2014-01-01 03:03:23 +00:00
Aidan C. Brady
2dc6a35d16
Fix a GUI bug, fixed gas tanks not loading properly, fix a few culling issues with Chemical Oxidizer, made gas render visually in Chemical Oxidizer
2013-12-31 16:38:40 -05:00
Aidan C. Brady
750bb2dab7
Rename Oxidation Chamber to Chemical Oxidizer and added model, will explain why below. This means a minor lang update @crafteverywhere, @VeryBigBro, @Vexatos
...
Notice that all Mekanism machines that perform similar tasks have a similar ending word; for example, the Metallurgic Infuser infuses alloys into ingots, and the Chemical Infuser infuses chemicals into other chemicals. Every ore processing machine has "Chamber" as the final word, and as this is not directly linked to ore processing, it would be best to move the "Oxidation" side of the machine to the end. Furthermore, for this chemical line, I am trying to keep "Chemical" as the first word in each machine title: Chemical Infuser, Chemical Oxidizer, Chemical Injection Chamber, etc. Hope that makes sense!
2013-12-31 15:07:09 -05:00
Ben Spiers
48b3e48ed3
Re-enable indev machines for now, change Chemical Formulator to Oxidation Chamber, introduce sulphur dust.
2013-12-30 02:59:45 +00:00
Aidan Brady
de93c376f6
Fix a little chunk loading issue
2013-12-28 22:09:33 -05:00
Ben Spiers
c1daf00154
Hopefully fix the weird compile problem in a smoother way (the generic gets erased at compile time anyway but apparently IDEA thinks it matters).
2013-12-27 01:21:55 +00:00
Aidan Brady
3cea13a272
Hopefully fix JZ’s compile bug
2013-12-24 16:41:01 -05:00
Aidan C. Brady
a41760affd
Chemical Injection Chamber initial work
2013-12-24 00:23:30 -05:00
Aidan C. Brady
6df7544540
Loads of javadocs, cleaned up Gas API code, removed old induction interfaces, made configurable machines notify neighbor when configuration changes, added functionality for GasStack-based ChemicaIInputs.
2013-12-23 17:06:22 -05:00
Aidan Brady
87ce53f3fe
Removed more UE stuff
2013-12-22 01:04:35 -05:00
Aidan Brady
4812b432fd
A few fixes, added recipes for balloons
2013-12-22 00:42:46 -05:00
Aidan Brady
6c87a8e288
Add Pos3D because vectors
2013-12-21 21:06:39 -05:00
Aidan Brady
f25bc6f941
Fixed saving
2013-12-21 15:58:59 -05:00
Aidan Brady
198305ff39
Fixed transfer issue
2013-12-21 14:54:12 -05:00
Aidan Brady
15aa17e441
Connections complete, colors now update renderer properly
2013-12-20 21:34:16 -05:00
Aidan Brady
d3661b3cd8
Got colors working, need to fix connections
2013-12-20 21:05:44 -05:00
Aidan Brady
2cf6fdc18c
Lots more work
2013-12-20 19:12:33 -05:00
Aidan Brady
f2d202d90f
Work on transporters
2013-12-20 17:46:24 -05:00
Aidan Brady
40e2d3b7fc
Bump version, work on multipart transporters
2013-12-20 16:47:09 -05:00
Aidan C. Brady
0ab803feeb
Rename Object3D to Coord4D, work on balloons
2013-12-20 16:09:09 -05:00
Aidan Brady
abaef2fd6d
Work on connections
2013-12-19 16:32:00 -05:00
Aidan Brady
4cd1c8f4f7
Fix a few crashes
2013-12-18 18:39:49 -05:00
Aidan Brady
8f24e5c18f
Got connection types to save/load, NONE sides will now not connect or emit to acceptors
2013-12-18 16:23:07 -05:00
Aidan C. Brady
5372bc66d6
More intelligent client-side scales
2013-12-18 11:19:30 -05:00
Aidan C. Brady
1152470dd6
Hopefully fixed an issue
2013-12-17 22:25:54 -05:00
Aidan C. Brady
fed49fbb05
Cleanup, fix a few things
2013-12-17 20:42:52 -05:00
Aidan C. Brady
4f5c26b0d2
Fixed a bunch of bugs - think that Pressurized Tubes and Mechanical Pipes are done for the most part
2013-12-17 20:28:25 -05:00
Aidan C. Brady
cf0ad408dd
Work on Mechanical Pipes
2013-12-17 18:20:18 -05:00
Aidan C. Brady
a601def4f6
More rendering; for some reason mech pipes are screwing up cache load
2013-12-17 15:54:06 -05:00
Aidan C. Brady
4a7b862fb7
Use defined scale to calculate when to send updates, atm 100 possible packet stages
2013-12-17 14:57:19 -05:00
Aidan C. Brady
60e2666a29
Render defined scale properly
2013-12-17 14:45:30 -05:00
Aidan C. Brady
ffd683a3f3
Fixed rendering
2013-12-17 14:39:30 -05:00
Aidan Brady
a3529a12d7
Fix a few bugs
2013-12-17 13:23:29 -05:00
Aidan C. Brady
4e74995143
Got some serious work done on Gas and Fluid network logistics
2013-12-17 12:53:33 -05:00
Ben Spiers
01818d4e26
Fix up the redstone switching/cover blocking support a bit.
2013-12-16 23:55:42 +00:00
Aidan Brady
6598295e3e
Work on Universal Cable split logistics, I think I got this @unpairedbracket
2013-12-16 17:54:27 -05:00
Aidan C. Brady
5272d169c4
Fixed a few bugs in the split() method and added in some new functionality for splitting of energy/fluid/gas! Unpairedbracket, shouldn't hurt you unless you modified split()
2013-12-16 15:00:57 -05:00
Ben Spiers
79e8b36a4b
Fix a few crashes
2013-12-16 15:57:03 +00:00
Aidan Brady
945aff6986
Fixed gas/fluid transfer
2013-12-15 00:03:45 -05:00
Aidan C. Brady
79f77dbdeb
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2013-12-14 15:36:16 -05:00
Ben Spiers
32f113ad77
First steps towards more dynamic capacity system to allow for differing capacity of universal cables in the future. Will optimise later.
2013-12-14 20:32:32 +00:00
Aidan C. Brady
bb8b89b7e7
Work on dynamic rendering based on both buffer amount and average transfer
2013-12-14 15:30:41 -05:00
Aidan C. Brady
acdbf1f3cb
Core code for Fluid and Gas networks
2013-12-14 00:36:52 -05:00
Aidan Brady
74d41073a6
Fixes, but getting an error for some reason
2013-12-12 23:08:16 -05:00
Aidan Brady
11c7efd8fc
Merge branch 'api-change' into multipart-experimental-new
2013-12-12 22:36:00 -05:00
Aidan Brady
6f99805443
Fix crash
2013-12-12 22:02:34 -05:00
Aidan Brady
2d5b633168
Work on stuff
2013-12-12 20:35:37 -05:00
Aidan Brady
43d3050b40
Work on Chemical Infuser
2013-12-12 18:33:56 -05:00
Aidan C. Brady
338da4d92c
Work on a more intuitive form of accepting gas in items and blocks
2013-12-12 16:54:55 -05:00
Ben Spiers
98c8068a0f
Get Mechanical Pipe rendering working a bit better.
2013-12-12 20:23:03 +00:00
Ben Spiers
c1318d998b
Merge, hopefully without screwing too much up.
2013-12-12 01:56:05 +00:00
Aidan C. Brady
f982eb851c
Remove now-unused generics
2013-12-06 07:57:26 -05:00
Aidan Brady
50b7870388
A few attempts to get multipart working. @unpairedbracket, I don’t know what the hell I’m doing, you’re gonna need to go over this.
2013-12-02 22:14:21 -05:00
Aidan Brady
5d8e21b776
Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new
...
Conflicts:
common/mekanism/api/gas/GasNetwork.java
common/mekanism/api/gas/GasTransmission.java
common/mekanism/api/transmitters/DynamicNetwork.java
common/mekanism/client/EnergyClientUpdate.java
common/mekanism/client/FluidClientUpdate.java
common/mekanism/client/GasClientUpdate.java
common/mekanism/client/render/tileentity/RenderUniversalCable.java
common/mekanism/common/EnergyNetwork.java
common/mekanism/common/FluidNetwork.java
common/mekanism/common/InventoryNetwork.java
common/mekanism/common/Mekanism.java
common/mekanism/common/item/ItemConfigurator.java
common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
common/mekanism/common/tileentity/TileEntityPressurizedTube.java
common/mekanism/common/tileentity/TileEntityTransmitter.java
common/mekanism/common/tileentity/TileEntityUniversalCable.java
common/mekanism/common/util/CableUtils.java
resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta
2013-12-02 21:45:40 -05:00
Aidan Brady
f853deb9c0
fixed API once again! :)
2013-12-01 00:15:52 -05:00
Aidan Brady
199ce13dcd
Re-add EnumColor to API!
2013-12-01 00:03:40 -05:00
Aidan Brady
5d949ec959
Fixed API for @micdoodle8
2013-11-30 23:19:24 -05:00
Aidan Brady
2c754cd506
Merge GasUtils into GasTransmission
2013-11-30 12:37:47 -05:00
Aidan Brady
a4ab6db57b
Fixes!
2013-11-30 12:29:49 -05:00
Aidan Brady
0c618a1cf3
Localization & gas fixes
2013-11-30 11:31:18 -05:00
Aidan Brady
b224a01f39
Work on localization support, move around some API classes to make better compatibility
2013-11-30 00:28:02 -05:00
Aidan Brady
20162970d8
Fixes!
2013-11-29 13:04:39 -05:00
Aidan Brady
82bae6e4bd
Rendering fixes!
2013-11-28 22:20:24 -05:00
Aidan Brady
00b4c6f3e3
Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part
2013-11-28 21:43:53 -05:00
Aidan Brady
98e864cd8d
Work on that Rotary Condensentrator!
2013-11-27 23:42:54 -05:00
Aidan Brady
96ba50a673
Many fixes!
2013-11-27 13:24:13 -05:00
Aidan Brady
dacc68e6c6
Gas API completely overhauled. Sorry @micdoodle8 :(
...
General cleanup, pressurized tubes are 40 times more efficient, a few enhancements, Miners balanced.
2013-11-26 20:11:26 -05:00
Aidan Brady
19feb2e602
Fixes by the dozen
2013-11-25 16:34:59 -05:00
Aidan Brady
d0253444c1
Tiny cleanup, off to bed. Tomorrow I implement a more advanced transporter system.
2013-11-25 00:14:56 -05:00
Aidan Brady
a360255f63
Greatly improve performance of transmitter networks, improved logistics of Mechanical Pipe
2013-11-25 00:00:26 -05:00
Aidan C. Brady
afae26f9b8
Rendering enhancements! Mechanical Pipes now function better and use the large Transmitter model.
2013-11-24 15:44:16 -06:00
Aidan C. Brady
59b945a33f
Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup
2013-11-24 12:12:42 -06:00
Aidan C. Brady
e44519dc7d
A ton of bug fixes, working on fixing teslas
2013-11-22 19:32:06 -05:00
Aidan Brady
0e2d2917d1
Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration
2013-11-21 21:37:03 -05:00
Aidan C. Brady
53323279c7
MekanismInduction module - done!
...
Still need to configure the build
2013-11-16 10:21:37 -05:00
Aidan C. Brady
8e08c9adb8
Once and for all fixed ConcurrentModificationException
2013-11-12 20:19:06 -05:00
Aidan Brady
f6704dc5ea
Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException
2013-11-11 17:23:14 -05:00
Aidan C. Brady
3c0c5bef0d
Major Universal Cable improvements, started work on Bin
2013-11-11 14:37:56 -05:00
Aidan Brady
dfd2985357
Transporters first try to send the item back home before idling
2013-11-09 15:30:30 -05:00
Aidan Brady
1aec33d8ec
Added configuration option to turn off strict input colors
2013-11-07 21:27:12 -05:00
Aidan Brady
1ff600b4a9
Added configurable restrictive input colors to all configurable machines, added some dandy sound effects
2013-11-04 21:11:09 -05:00
Aidan Brady
01a6174fdb
Lots of things!
2013-11-03 16:54:33 -05:00
Aidan C. Brady
289a2ee227
Configurable machine output colors
2013-11-02 01:31:32 -04:00
Aidan Brady
c281fcb14b
Fix up a bunch of issues. This should fix epicbastion's problem honestly.
2013-11-01 19:14:02 -04:00
Aidan Brady
04d9b3dc68
Some fixes
2013-10-30 20:35:11 -04:00
Aidan C. Brady
656f74983f
Lots of progress on ejectors and GUIs
2013-10-30 15:22:43 -04:00
Aidan Brady
def9764b0d
Remove IAccessibleGui
2013-10-27 00:10:17 -04:00
Aidan Brady
b405c42e2f
Remove useless InventoryNetwork
2013-10-25 21:34:55 -04:00
Aidan C. Brady
ab8361f9e8
Just about finished rendering! :D
2013-10-23 20:34:33 -04:00
Aidan C. Brady
33c8f960f3
Some work on rendering, still really incomplete
2013-10-21 23:46:24 -04:00
Aidan C. Brady
b4e53a5c54
More work on logistical transporters, getting these logistics down!
2013-10-21 20:54:28 -04:00
Aidan Brady
4b82ab6cc1
Work on transporters, don't use them unless you like buggy item transport pipes that currently do nothing
2013-10-20 22:47:20 -04:00
Aidan C. Brady
5b44e0f409
Synchronized network code, should be thread safe.
2013-10-20 00:04:11 -04:00
Aidan C. Brady
1b717267f3
Moved client-sensitive info over to MekanismClient
2013-10-14 23:36:07 -04:00
Aidan C. Brady
c0651a9377
Fixed walkie talkies stacking, they now glow when in on state
2013-10-14 16:13:32 -04:00
Ben Spiers
132306ed76
Multipart and everything
2013-10-03 00:10:20 +01:00
