Commit graph

85 commits

Author SHA1 Message Date
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 b593c7c202 Updated IC2 API, added in option to disable particles/lighting updates on machines 2014-02-14 17:55:34 -05:00
Aidan Brady f617e188f4 Quick fixes 2014-02-05 21:37:17 -05:00
Aidan Brady b821be5417 General enhancements 2014-02-05 20:22:43 -05:00
Aidan Brady afd954b510 Begin implementation of new AD model 2014-02-04 23:06:33 -05:00
Aidan C. Brady efe2502be1 Friction Boots - semi-working 2014-02-01 16:33:27 -05:00
Aidan C. Brady 32b0e7f1cc Work on new GUIs 2014-01-31 16:32:13 -05:00
Aidan C. Brady b180f4e968 Started on new machines 2014-01-26 17:12:03 -05:00
Aidan Brady 41b2d1c2bb Start on Salination Plant fancy render 2014-01-16 21:55:29 -05:00
Aidan C. Brady 804d071643 More work on salivation controllers 2014-01-14 00:17:15 -05:00
Aidan C. Brady 5dfee9ec7a Precision Sawmill and overall Chance Machine framework GUI & Container 2014-01-13 00:06:13 -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 d3f4934daa Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-11 22:19:58 -05:00
Aidan C. Brady 282c6fc07a Fixed that crash 2014-01-11 22:19:51 -05:00
Ben Spiers 6fa8cebb3a Make a start on the Salination plant. Primitive so far but the multiblock system just about works. 2014-01-11 23:35:39 +00:00
Aidan Brady 70d3140296 Config property for displaying different energy units 2014-01-11 11:49:27 -05:00
Aidan C. Brady 0b98b085d3 Add fancy energy info tabs, fix a few things, bump up both energy usage and generation on some machines/generators 2014-01-10 17:42:53 -05:00
Aidan Brady df2ea3155a Updated GUI textures to fix copy alpha screw up 2014-01-09 18:47:38 -05:00
Aidan Brady 1151084209 Fixed a crash 2014-01-09 08:40:20 -05:00
Aidan Brady 2644fed4f8 A few corner cases in GUI checks, closes #795 2014-01-08 19:51:05 -05:00
Aidan Brady 4ab61c856f Organized some classes, began work on balloon entity connections 2014-01-07 20:55:50 -05:00
Ben Spiers 333afdc79b Remove the old transmitter renderer, enable the new one to render in hand and inventory 2014-01-07 16:22:59 +00:00
Aidan C. Brady 7c4d0ba714 Properly register items, kill old transmitter code and converter as users will be starting from a clean world 2014-01-05 02:24:06 -05:00
Aidan Brady 99ca8f6624 Cleanups and fixes from the electrolytic separator update 2014-01-02 22:30:23 -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 C. Brady 67d38fd179 Removed Chemical Combiner (hopefully all references) 2014-01-01 16:21:55 -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
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 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 Brady 84f4eaee76 Christmas fun :) 2013-12-24 14:38:12 -05:00
Aidan C. Brady bd1e3234ff Fixed crash 2013-12-24 11:20:22 -05:00
Aidan Brady 5a241ce8ee Work on GUIs 2013-12-11 20:24:37 -05:00
Aidan Brady 250ddadcf0 Dictionary! :) 2013-12-09 20:52:49 -05:00
Aidan C. Brady 5661b20b27 A few fixes 2013-12-09 11:56:48 -05:00
Aidan Brady 4ebf11ed5a Fix crash 2013-12-09 07:19:16 -05:00
Aidan C. Brady 8289af18fd Add configurable sound volume for all Mekanism sounds 2013-12-08 12:49:48 -05:00
Aidan Brady c2737ff064 Work on things, may be unstable 2013-12-07 17:06:11 -05:00
Aidan C. Brady a204df448f Work on jetpacks 2013-12-05 15:50:38 -05:00
Aidan Brady bf9d48d86f Work on jetpacks - specifically networking fixes and sounds! 2013-12-04 16:53:58 -05:00
Aidan Brady a4ab6db57b Fixes! 2013-11-30 12:29:49 -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 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 98e864cd8d Work on that Rotary Condensentrator! 2013-11-27 23:42:54 -05:00
Aidan Brady 419a295096 Work on Rotary Condensentrator, fix IC2 energy integration (mostly) 2013-11-27 18:17:44 -05:00