tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1422 commits 2 branches 0 tags 102 MiB
Commit graph

1422 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 C. Brady
74a64b3373 pulpWood for sawdust 2014-01-17 18:07:29 -05:00
Aidan C. Brady
310e36edf7 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-17 11:18:10 -05:00
Aidan C. Brady
9b7abb8d96 Added null check 2014-01-17 11:18:04 -05:00
Aidan
c812474277 Merge pull request #853 from Mierzen/patch-2 
Re-update Elec. Seperator and Sawmill tooltip
 2014-01-17 08:15:45 -08:00
Mierzen
b9018c8dce Re-update Elec. Seperator and Sawmill tooltip 
Changed my previous edit:  made the multiline tooltip display better ("more square")
 2014-01-17 17:29:00 +02:00
Aidan C. Brady
61306fd664 More work on things 2014-01-17 09:17:38 -05:00
Aidan C. Brady
95a3084897 Work on basic block multi-id-meta stuff 2014-01-17 07:33:34 -05:00
Aidan C. Brady
af1ab186d9 Finish Salination Controller rendering, start work on a separate Salination Controller block. 
..this means a lot of extra work to get multiple-id-meta-handling working with BasicBlocks.
 2014-01-16 22:49:48 -05:00
Aidan C. Brady
0f06146292 You think sleep can stop me? HA! 
...work on rendering.
 2014-01-16 22:12:51 -05:00
Aidan Brady
41b2d1c2bb Start on Salination Plant fancy render 2014-01-16 21:55:29 -05:00
Aidan Brady
44ae2e8606 Added null check for Vaygrim 2014-01-16 21:41:14 -05:00
Aidan Brady
fedb728709 Oops! 2014-01-16 21:36:32 -05:00
Aidan Brady
db029274f7 Fix up GUIs 2014-01-16 21:31:30 -05:00
Aidan Brady
175f3e8646 Got GUIs working with new fanciness 2014-01-16 21:26:40 -05:00
Aidan Brady
9acc264726 A few fixes 2014-01-16 20:50:59 -05:00
Aidan Brady
da6c0a2c90 Finish base code for gas-based advanced machinery 2014-01-16 20:35:05 -05:00
Aidan Brady
4fb335b7d3 Lay down framework for gas-based advanced machines 2014-01-16 19:00:53 -05:00
Aidan Brady
1de691be1d Fix stacking of brine buckets 2014-01-16 16:49:19 -05:00
Aidan Brady
6d366c0475 Brine Buckets! 2014-01-16 16:47:35 -05:00
Aidan Brady
4d29a57a27 A few fixes, new textures 2014-01-16 16:31:05 -05:00
Aidan C. Brady
3e6a017979 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-16 16:04:18 -05:00
Aidan C. Brady
d3ae5be20b Work on things! 2014-01-16 16:03:05 -05:00
Aidan
b9e2cc27fe Merge pull request #843 from ruifung/patch-1 
Remove redundant energy unit in cable tooltip.
 2014-01-16 09:21:19 -08:00
ruifung
4e49ec6a76 Remove redundant energy unit in cable tooltip. 
MekanismUtils.getEnergyDisplay() already returns a string with the energy unit chosen in config.
 2014-01-17 00:04:50 +08:00
Aidan
aaf1ea45d6 Merge pull request #841 from Vexatos/patch-1 
Update de_DE.lang
 2014-01-16 05:22:23 -08:00
Aidan
32039adbec Merge pull request #842 from Mierzen/patch-1 
Multi-line tooltips
 2014-01-16 05:22:18 -08:00
Mierzen
7399560de3 Multi-line tooltips 
Change Electorlytic Seperator and Precision Sawmill tooltips to be multi-line.
 2014-01-16 11:01:40 +02:00
Vexatos
411713e60f Update de_DE.lang 2014-01-16 07:57:20 +01:00
Aidan C. Brady
f6bca1d2c9 Added Salination Plant component recipes, removed a few printlns, more descriptive multiblock issue notifications 2014-01-15 23:52:10 -05:00
Aidan Brady
ee0193cb3d Made that sawmill quieter 2014-01-15 23:12:48 -05:00
Aidan Brady
053b6f34f6 Salination Controller GUI handler because I’m nice 2014-01-15 23:03:40 -05:00
Aidan Brady
e83455ad2b Fix cable tooltip 2014-01-15 18:02:19 -05:00
Aidan Brady
40663d6a6a Fixed #838, thanks @Not-steve 2014-01-15 18:01:12 -05:00
Aidan Brady
9c5ee1e7f8 Fix silk not working 2014-01-15 17:52:29 -05:00
Aidan C. Brady
7d69639a8a A few bug fixes 2014-01-15 17:36:38 -05:00
Aidan C. Brady
b89349894e Fix spawner config 2014-01-15 10:43:11 -05:00
Aidan C. Brady
5e775a9c8a Fixed recipe conflict 2014-01-15 07:54:12 -05:00
Aidan C. Brady
ab58f76d6b Tooltips! 2014-01-15 07:45:55 -05:00
Aidan C. Brady
d03b2b28be Fix Gas Masks making you completely invincible 2014-01-15 07:22:50 -05:00
Aidan C. Brady
da8a1a78db Fixes! :) 2014-01-14 22:31:59 -05:00
Aidan C. Brady
fe2deb9b9b And yet more Salination Plant work! 2014-01-14 22:00:23 -05:00
Aidan C. Brady
ae5fe1cfbf Just about finished Salination Plant multiblock stuff 2014-01-14 21:29:46 -05:00
Aidan C. Brady
514225180b Don't auto-build multiblock 2014-01-14 19:50:11 -05:00
Aidan C. Brady
992b24e868 Fixes 2014-01-14 18:43:41 -05:00
Aidan C. Brady
98f3f544cd More salivation plant work 2014-01-14 18:30:26 -05:00
Aidan C. Brady
e726e5039e Work on Salination Plants 2014-01-14 16:19:21 -05:00
Aidan C. Brady
7ed788cab4 Finalized Salination Controller algo 2014-01-14 11:38:53 -05:00
Aidan C. Brady
56db9737f6 Work on multiblock algorithm 2014-01-14 11:28:09 -05:00