Aidan C. Brady
|
ebdbdbefe3
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-01-12 21:23:41 -05:00 |
|
|
Aidan C. Brady
|
89a70f4444
|
Cardboard Boxes. Yep :)
|
2014-01-12 21:23:34 -05:00 |
|
Anton
|
3e0c37a079
|
Update ru_RU.lang
Adapted !n for ru_RU.lang
|
2014-01-12 15:21:21 +03:00 |
|
|
Anton
|
1af883a22b
|
Update ru_RU.lang
|
2014-01-12 09:40:44 +03: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
|
76a131c8aa
|
Merge pull request #811 from Vexatos/patch-1
Update de_DE.lang
|
2014-01-11 08:50:24 -08:00 |
|
|
Aidan Brady
|
70d3140296
|
Config property for displaying different energy units
|
2014-01-11 11:49:27 -05:00 |
|
Vexatos
|
3fecbb8b2b
|
Update de_DE.lang
|
2014-01-11 17:33:31 +01:00 |
|
|
Aidan C. Brady
|
dc69809d15
|
Merge branches 'development' and 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-01-10 23:17:31 -05:00 |
|
|
Aidan C. Brady
|
5a477fd62d
|
Colorful!
|
2014-01-10 23:17:09 -05:00 |
|
|
Ben Spiers
|
f87c27aeee
|
Make the standard power bar a GuiElement. I think it might be good to move towards a more modular gui system. Have more stuff done in code and less in graphics.
|
2014-01-11 02:50:02 +00:00 |
|
|
Aidan C. Brady
|
9393ddcbc6
|
Cooler energy info tab
|
2014-01-10 17:45:59 -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 C. Brady
|
01f3569acd
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-01-10 16:56:14 -05:00 |
|
|
Aidan Brady
|
34cda86ec8
|
Start work on something :)
|
2014-01-10 16:54:26 -05:00 |
|
|
Aidan C. Brady
|
e2cdf625c1
|
New Hydrogen Chloride texture
|
2014-01-10 15:27:12 -05:00 |
|
|
Aidan C. Brady
|
836dd3c22a
|
Electrolytic Separator NEI plugin
|
2014-01-10 12:58:05 -05:00 |
|
|
Aidan C. Brady
|
6eb43d11d7
|
Just about finished Rotary Condensentrator NEI support
|
2014-01-10 08:12:47 -05:00 |
|
|
Aidan Brady
|
531bfe85ee
|
Add base class for Rotary Condensentrator NEI plugin as well
|
2014-01-09 20:52:19 -05:00 |
|
|
Aidan Brady
|
f7eb278276
|
Chemical Infuser recipe handler!
|
2014-01-09 20:47:06 -05:00 |
|
|
Aidan Brady
|
df2ea3155a
|
Updated GUI textures to fix copy alpha screw up
|
2014-01-09 18:47:38 -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 Brady
|
2cad51412d
|
Localization for new cables
|
2014-01-07 07:17:26 -05:00 |
|
|
Aidan Brady
|
6d37ec3dd8
|
Add more missing locales
|
2014-01-05 16:03:31 -05:00 |
|
|
Aidan Brady
|
8ba9aefcda
|
Add missing localization
|
2014-01-05 15:15:25 -05:00 |
|
|
Ben Spiers
|
4b1adf76bc
|
Stop FML complaining about item conflicts, fix my translation.
|
2014-01-05 17:53:10 +00:00 |
|
|
Ben Spiers
|
0193659c74
|
Switch the injection chamber to use HCl, up the difficulty of obtaining sulphur dust to prepare for sulphuric acid's use in top-tier processing.
|
2014-01-05 16:22:41 +00:00 |
|
|
Ben Spiers
|
7109e84907
|
Gui element stuff.
|
2014-01-05 16:22:41 +00:00 |
|
|
Aidan C. Brady
|
55a0e39c07
|
Digital Miner inverse mode
|
2014-01-04 11:41:09 -05:00 |
|
|
Anton
|
12c96465b0
|
Update ru_RU.lang
|
2014-01-03 11:33:34 +03:00 |
|
|
Aidan C. Brady
|
c0dba3c366
|
Fixed GUI issue, fixed particles
|
2014-01-03 00:43:55 -05:00 |
|
|
Aidan Brady
|
2cf27c698d
|
Added Compressed Redstone as an efficient means of obtaining redstone infuse
|
2014-01-02 23:46:23 -05:00 |
|
|
Aidan Brady
|
cb0b6f4a83
|
New, awesome Electrolytic Separator GUI :)
|
2014-01-02 23:34:52 -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 |
|
|
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
|
c8d765bde0
|
Merge pull request #772 from Vexatos/patch-1
Update de_DE.lang
|
2014-01-02 10:19:44 -08:00 |
|
|
Anton
|
30e8c19846
|
Update ru_RU.lang
|
2014-01-02 12:14:45 +03:00 |
|
|
Vexatos
|
701f20615e
|
Update de_DE.lang
|
2014-01-02 08:30:51 +01: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 |
|
|
Anton
|
13a322d6ee
|
Update ru_RU.lang
Tooltips translated.
|
2014-01-01 17:45:43 +03:00 |
|
|
Aidan
|
4785182513
|
Merge pull request #770 from Vexatos/patch-1
Update de_DE.lang
|
2014-01-01 00:23:34 -08:00 |
|
|
Vexatos
|
0703bb66d5
|
Update de_DE.lang
|
2014-01-01 08:56:34 +01:00 |
|
|
Anton
|
f9dce4d5e5
|
Update ru_RU.lang
|
2014-01-01 10:53:50 +03: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
|
69032ed2a0
|
Merge pull request #768 from Vexatos/patch-1
Update de_DE.lang
|
2013-12-31 13:51:21 -08:00 |
|