Aidan C. Brady
ac16039ecf
Merge branch 'master' into development
...
Conflicts:
common/mekanism/client/render/MekanismRenderer.java
common/mekanism/common/Mekanism.java
common/mekanism/common/integration/OreDictManager.java
common/mekanism/common/network/PacketPortableTeleport.java
common/mekanism/common/tile/TileEntitySalinationController.java
common/mekanism/generators/common/MekanismGenerators.java
common/mekanism/tools/common/MekanismTools.java
2014-03-07 21:39:13 -05:00
Victor Robertson
e5a6eadc45
Fix indentation and remove trailing whitespace
...
This patch provides common/mekanism/*.java with standardized
indentation (tabs) and also removes trailing whitespace.
2014-03-07 19:20:35 -06:00
Aidan C. Brady
8b70e0d50d
v6.0.4 push
2014-03-07 10:46:43 -05:00
Aidan C. Brady
b3f9c48afe
Attempt some memoization, please test and report pgatt, judge
2014-02-17 18:48:31 -05:00
Aidan
5d494a8d8d
Merge pull request #963 from spookydonut/development
...
Made Electrolytic Separators vent excess gas by default
2014-02-04 14:48:53 -08:00
Aidan C. Brady
89e2279cb9
Fix a few bugs
2014-02-04 08:15:20 -05:00
spookydonut (Ash Wiren)
6400dfe3bb
Made Electrolytic Separators vent excess gas by default
2014-02-04 13:29:27 +08:00
Aidan C. Brady
69a05815d7
Wow. Fixed a ridiculously dumb CME.
2014-02-01 22:37:22 -05:00
Aidan C. Brady
30782caa8b
Cardboard Box blacklist
2014-02-01 19:02:51 -05:00
Aidan C. Brady
90328958bb
Finished recipe system for new machines.
2014-01-28 15:51:30 -05:00
Aidan C. Brady
b0fbaba62b
Start work on recipe systems
2014-01-26 17:55:49 -05:00
Aidan C. Brady
a2c392f03d
Fixed dumb cardboard boxes
2014-01-22 14:37:25 -05:00
Aidan C. Brady
0a0e329223
Ore gasses! For use in T4 (5x) ore processing.
2014-01-21 17:58:00 -05:00
Aidan C. Brady
52aa704a74
Add in textures for some future stuff
2014-01-19 20:32:16 -05:00
Aidan Brady
ee2b81c3fd
Fix up Clay Block recipe
2014-01-18 12:08:11 -05:00
Aidan Brady
f5c607bef0
Fix up blacklist for cardboard boxes!
2014-01-18 00:45:27 -05:00
Aidan C. Brady
7db4a114f6
Fixes
2014-01-17 21:29:39 -05:00
Aidan C. Brady
0314b11edb
Hopefully fix some things
2014-01-17 20:38:05 -05:00
Aidan Brady
4fb335b7d3
Lay down framework for gas-based advanced machines
2014-01-16 19:00:53 -05:00
Aidan C. Brady
56db9737f6
Work on multiblock algorithm
2014-01-14 11:28:09 -05:00
Aidan Brady
71cfd3cd84
Better textures, sounds for Chemical Infuser, Chemical Oxidizer & Precision Sawmill, sounds now fade in
2014-01-13 22:27:47 -05:00
Aidan Brady
0aafa16106
Fix a few things, start on recipes
2014-01-13 18:37:54 -05:00
Aidan C. Brady
19b36e901b
Work on Precision Sawmill, added Sawdust, finished ChanceMachine tile and recipe foundation
2014-01-12 23:55:42 -05:00
Aidan C. Brady
89a70f4444
Cardboard Boxes. Yep :)
2014-01-12 21:23:34 -05:00
Aidan C. Brady
836dd3c22a
Electrolytic Separator NEI plugin
2014-01-10 12:58:05 -05:00
Aidan Brady
f7eb278276
Chemical Infuser recipe handler!
2014-01-09 20:47:06 -05:00
Aidan Brady
40684e2bab
Start work on Electrolytic Separator and Chemical Oxidizer recipe handlers. Also start work on gas/fluid NEI lookups!
2014-01-09 19:11:40 -05:00
Aidan C. Brady
f0e5c7c468
General cleanup
2014-01-08 18:28:17 -05:00
Ben Spiers
ac07e54a1c
Separate the current buffer from the throughput when examining a network
2014-01-07 03:17:59 +00:00
Aidan C. Brady
1129a33bf6
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
2014-01-05 16:28:11 -05:00
Aidan C. Brady
a9143ee318
Added Electrolytic Separator recipes to RecipeHelper API
2014-01-05 16:27:56 -05:00
Aidan Brady
30055fc3ed
Fixed Balloons screwing up (again)
2014-01-05 15:06:54 -05:00
Aidan Brady
8118e96efb
Fix weird connection issue
2014-01-03 12:13:49 -05:00
Aidan Brady
cb0b6f4a83
New, awesome Electrolytic Separator GUI :)
2014-01-02 23:34:52 -05:00
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
