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
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
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 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
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
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
a41760affd
Chemical Injection Chamber initial work
2013-12-24 00:23:30 -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
0ab803feeb
Rename Object3D to Coord4D, work on balloons
2013-12-20 16:09:09 -05:00
Aidan C. Brady
854c909c4c
Merge branch 'master' into development
2013-12-18 12:07:52 -05:00
Aidan C. Brady
65c201d829
Add try/catch to prevent OreDict iteration GUI render crash
2013-12-18 12:05:09 -05:00
Aidan C. Brady
1e1eabfd5e
Even more localization, fixed a few tiny bugs
2013-12-14 15:13:12 -05:00
Aidan Brady
9ecb7c20fd
More work on Infuser
2013-12-12 19:04:02 -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
Aidan Brady
5a241ce8ee
Work on GUIs
2013-12-11 20:24:37 -05:00
Aidan C. Brady
7e48fa2743
Work on container code
2013-12-11 16:34:54 -05:00
Aidan Brady
250ddadcf0
Dictionary! :)
2013-12-09 20:52:49 -05:00
Aidan Brady
afe85f9215
Fix some pesky bugs and crashes
2013-12-03 16:56:03 -05:00
Aidan Brady
f55d3ac874
Added Factory input slot distribution, configurable voice ports, fixed several bugs
2013-12-01 12:38:34 -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
1be0d218af
Final fix for now - fixed electric machine GUIs
2013-11-30 12:48:22 -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
ba32a2b112
More localization support!
2013-11-30 00:43:54 -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
0f61c5d50c
A few fixes, and fancy Configurator GUI hovering!
2013-11-29 19:11:07 -05:00
Aidan Brady
3d167922be
Add IDeepStorageUnit support
2013-11-29 15:39:37 -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
ccae995242
Work on Rotary Condensentrator, fixed an issue with factories
2013-11-28 16:01:23 -05:00
Aidan Brady
fb3aa53eaf
Fix several bugs!
2013-11-28 10:13:06 -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
b950960aea
Dynamic Tanks are now 300% better.
2013-11-26 22:44:14 -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
e2e7274cd6
Fix a few bugs. Signing off, see you all later!
2013-11-25 18:23:24 -05:00
Aidan C. Brady
fea5e8dab7
Pressurized Tubes now render gas in connected block bounds dynamically
2013-11-24 16:01:35 -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
5b690e9bfb
Merge pull request #461 from pixlepix/master
...
Logistical Diverter
2013-11-23 11:44:03 -08:00
Aidan C. Brady
22c07254fd
Purification, Compressing, and Combining factories :)
2013-11-23 14:36:50 -05:00
pixlepix
45b449078c
Added CC peripheral support for digital miner
2013-11-23 09:04:05 -05:00
Aidan C. Brady
0adc0dc75e
Attempt to use my own unit system
2013-11-22 20:58:49 -05:00
