Aidan Brady
7ad60f0796
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-02 21:58:23 -05:00
Aidan Brady
9acc744794
Fixed differing gas networks being able to merge, fix API issue
2014-01-02 21:58:14 -05:00
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
