Ben Spiers
f84bc43be1
Move separator into mek core, let IDEA optimise imports. Hope I didn't screw anything up too badly.
2014-01-03 02:09:21 +00: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
Aidan Brady
5da3b31455
Make CIC use sulfur instead of gunpowder as a backup resource, dynamic GUI title rendering to prevent escaping
2014-01-02 13:11:08 -05:00
Aidan Brady
00bbb9d5c4
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-02 13:00:15 -05:00
Aidan Brady
3990ab4f42
Have NEI plugin iterate over possible fuel stacks, register sulfur dust in oredict
2014-01-02 13:00:09 -05:00
Aidan C. Brady
ea76a68112
Fix factory GUI support with sulfuric acid
2014-01-01 19:26:20 -05: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
Aidan Brady
692a8a0412
Finished Chemical Infuser rendering, added in recipes for new machines (including Combiner which means there may be a tiny conflict if you’ve already started on the name change @unpairedbracket)
...
Also…happy new year everyone :)
2014-01-01 00:58:58 -05:00
Aidan C. Brady
c1e40be9ad
Added Chemical Infuser model, still need to add dynamic rendering (shouldn't be too hard since I already have Chemical Oxidizer framework complete
2013-12-31 22:54:39 -05: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
Ben Spiers
571ad3944f
Sulphur dioxide and sulphur trioxide
2013-12-31 22:24:46 +00:00
Aidan C. Brady
371efa9ece
Fix item render
2013-12-31 16:51:02 -05: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
a277b6e266
Fixed a few bugs and reverted name changes of Sulfuric Acid in liquid/gas form. Even though it's not scientifically correct, it fits better with the Mekanism theme and is easier to understand.
2013-12-31 15:23:04 -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 C. Brady
2241e7e7b9
A few fixes
2013-12-27 12:44:08 -05:00
Aidan C. Brady
4d64afb7d9
Made KeySync use keybinds instead of defaults
2013-12-26 12:02:17 -05:00
Aidan Brady
28a63cc9d2
More proxy fixes, chemical injection chamber sound
2013-12-24 17:17:00 -05:00
Aidan Brady
3ed2d3ce6c
Fixed render crash
2013-12-24 17:14:28 -05:00
Aidan Brady
fdc94550ee
Fix a few bugs
2013-12-24 16:58:14 -05:00
Aidan Brady
7a71bc7848
Better holiday stuff
2013-12-24 16:06:57 -05:00
Aidan C. Brady
d63628bebc
Merge branch 'master' into development
...
Conflicts:
common/mekanism/client/ClientProxy.java
common/mekanism/client/HolidayManager.java
common/mekanism/client/sound/SoundHandler.java
common/mekanism/client/sound/TileSound.java
2013-12-24 14:44:17 -05:00
Aidan Brady
84f4eaee76
Christmas fun :)
2013-12-24 14:38:12 -05:00
Aidan Brady
fd26b9b11b
Work on a little Christmas surprise
2013-12-24 13:25:31 -05:00
Aidan C. Brady
9498b01475
Finished off the Chemical Injection Chamber, just need sounds
2013-12-24 12:39:27 -05:00
Aidan C. Brady
4cf33562c6
Merge branch 'master' into development
2013-12-24 12:19:24 -05:00
Aidan C. Brady
bd1e3234ff
Fixed crash
2013-12-24 11:20:22 -05:00
Aidan C. Brady
a41760affd
Chemical Injection Chamber initial work
2013-12-24 00:23:30 -05:00
Aidan C. Brady
9ed16f3006
A few fixes, please update!
2013-12-23 20:23:37 -05:00
Aidan C. Brady
52319ed31e
A few fixes, please update!
2013-12-23 20:23:23 -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 C. Brady
b060c2c005
Fix silly upgrade GUI bug
2013-12-22 23:24:20 -05:00
Aidan C. Brady
6b420d07d2
Support for items/blocks with multiple OreDict entries
2013-12-22 18:28:49 -05:00
Aidan Brady
d4fc39274e
Threaded VoiceConnection, made client connection fire with server-configured port
2013-12-22 16:49:04 -05:00
Aidan C. Brady
90985663bb
Sync server configs with client
2013-12-22 01:49:55 -05:00
Aidan Brady
ced44e97fc
A few fixes, dynamic distance calculating as called by ILogisticalTransporter. Off to bed, more work tomorrow!
2013-12-22 01:21:40 -05:00
Aidan Brady
87ce53f3fe
Removed more UE stuff
2013-12-22 01:04:35 -05:00
Aidan Brady
6c87a8e288
Add Pos3D because vectors
2013-12-21 21:06:39 -05:00
Aidan Brady
bbbd5dea73
Fix some rendering bugs
2013-12-21 01:31:52 -05:00
Aidan Brady
d3661b3cd8
Got colors working, need to fix connections
2013-12-20 21:05:44 -05:00
Aidan Brady
7bb6b2761b
Base code done, onto actual implementation
2013-12-20 18:29:22 -05:00
Aidan Brady
2fcbbcfa6a
Loads of work on transporters
2013-12-20 18:14:31 -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
48af6f8fcc
Balloons :)
2013-12-20 13:27:54 -05:00
Aidan Brady
510debc0fb
Kill induction module and start on balloons :)
2013-12-20 01:05:41 -05:00
Aidan Brady
fbed46c0d9
More fixes
2013-12-19 16:55:41 -05:00
