Aidan Brady
|
5ffd5534da
|
Start on to-be-named log processor
|
2014-01-12 22:47:08 -05:00 |
|
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 |
|
Ben Spiers
|
2717f6fd4a
|
Redstone sensitivity on transmitters.
|
2014-01-12 21:27:45 +00:00 |
|
Aidan Brady
|
9895caaadc
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-01-12 12:14:22 -05:00 |
|
Aidan Brady
|
f59e12d9cf
|
Fix Atomic Disassembler vein issue
|
2014-01-12 12:14:15 -05:00 |
|
Aidan
|
deccbf2704
|
Merge pull request #821 from VeryBigBro/patch-9
Update ru_RU.lang
|
2014-01-12 08:48:53 -08:00 |
|
Aidan Brady
|
9eef8c43b6
|
Allow for SMP-side mc dir access
|
2014-01-12 11:46:25 -05:00 |
|
Anton
|
3e0c37a079
|
Update ru_RU.lang
Adapted !n for ru_RU.lang
|
2014-01-12 15:21:21 +03:00 |
|
Aidan
|
79cab45e41
|
Merge pull request #820 from VeryBigBro/patch-8
Update ru_RU.lang
|
2014-01-11 23:23:36 -08:00 |
|
Anton
|
1af883a22b
|
Update ru_RU.lang
|
2014-01-12 09:40:44 +03:00 |
|
Aidan C. Brady
|
16219e501e
|
Fix a few debug codes
|
2014-01-11 22:24:15 -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
|
a1cc44bb90
|
Iteration #2 of salination plants, they have a more defined shape now but the algorithm seems very costly so it only does it when configurated. Still work to do.
|
2014-01-12 03:05:53 +00: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
|
7b5b5b3482
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-01-11 11:49:34 -05: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
|
873363f372
|
Apache no more
|
2014-01-11 11:04:14 -05:00 |
|
Aidan C. Brady
|
88d7653aa1
|
Added some more blocks to Digital Miner blacklist.
|
2014-01-11 10:56:59 -05:00 |
|
Aidan Brady
|
a3012b05fb
|
Fixed vein Redstone Ore support
|
2014-01-11 00:16:31 -05:00 |
|
Aidan Brady
|
1df6fc689a
|
Unless we set up an access transformer, this is necessary on my end
|
2014-01-10 23:26:48 -05: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
|
ce7fbaaeb0
|
Remove a loop in the solar generator code that was causing a big performance hit. As far as I can tell all it did was disable it if there were other solars above. By all means put it back if it was more important than that.
|
2014-01-11 02:53:09 +00: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 Brady
|
73f0c646c8
|
Quick cleanup
|
2014-01-10 16:35:29 -05:00 |
|
Aidan Brady
|
210e949ed4
|
Slow, med and fast rates for Atomic Disassembler
|
2014-01-10 16:32:00 -05:00 |
|
Ben Spiers
|
b49d067f0c
|
Some hopeful performance improvements to getConnections() and emit()
|
2014-01-10 20:33:19 +00:00 |
|
Aidan C. Brady
|
e2cdf625c1
|
New Hydrogen Chloride texture
|
2014-01-10 15:27:12 -05:00 |
|
Aidan C. Brady
|
6728abde06
|
Added vein mining to Atomic Disassembler, bumped energy usage
|
2014-01-10 13:52:30 -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
|
dac7fd44f9
|
Work on Rotary Condensentrator recipe handler
|
2014-01-09 22:09:48 -05:00 |
|
Aidan Brady
|
c0356d4d64
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-01-09 21:46:33 -05:00 |
|
Aidan Brady
|
c61db44bf4
|
Going to use Sulfuric Acid/Sulfur in the Chemical Injection Chamber until we get Salt/Brine/etc down
|
2014-01-09 21:46:22 -05:00 |
|
Ben Spiers
|
3d89829278
|
Fix macquotes in mcmod.info files.
|
2014-01-10 02:16:39 +00: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 C. Brady
|
723be4cdee
|
NEI gas lookups for usage and crafting working!
|
2014-01-09 19:25:44 -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 Brady
|
973dd92931
|
Remove println, add progress action
|
2014-01-09 18:53:47 -05:00 |
|
Aidan Brady
|
df2ea3155a
|
Updated GUI textures to fix copy alpha screw up
|
2014-01-09 18:47:38 -05:00 |
|
Aidan C. Brady
|
47e24b8575
|
Added in a recipe handler for the Chemical Oxidizer
|
2014-01-09 18:06:44 -05:00 |
|