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

1386 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan Brady
5a3595778a Update ItemAttacher to work with new transmitters 2014-01-03 17:19:02 -05:00
Aidan Brady
e5400a2a77 Revert "Attempt to fix fault build via submodule" 
This reverts commit 7d57681cca.
 2014-01-03 17:04:16 -05:00
Aidan Brady
7d57681cca Attempt to fix fault build via submodule 2014-01-03 16:59:13 -05:00
Aidan Brady
1835f6ff91 Update TE, add module config syncing 2014-01-03 14:26:41 -05:00
Aidan Brady
a4f6690ee9 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-03 12:13:55 -05:00
Aidan Brady
8118e96efb Fix weird connection issue 2014-01-03 12:13:49 -05:00
Aidan C. Brady
187403e72c Fixed a factory transfer issue 2014-01-03 10:07:35 -05:00
Aidan
f78c467fd3 Merge pull request #777 from VeryBigBro/patch-7 
Update ru_RU.lang
 2014-01-03 06:07:05 -08:00
Aidan C. Brady
b538565846 Removed println, fixed possible crash 2014-01-03 08:34:56 -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 C. Brady
eb6db2dda1 Fix Electrolytic Separator crash 2014-01-03 00:03:28 -05:00
Aidan C. Brady
5e8dcd6c7d Fix crash due to java being bad 2014-01-03 00:01:53 -05:00
Aidan C. Brady
1ec410d67c Added NEI stack iteration implementation for Metallurgic infuses 2014-01-02 23:58:20 -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
Aidan Brady
26f8aef381 Add check for old separators, add colorblind support to Logistical Transporter 2014-01-02 22:11:40 -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
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
a50efa8cf5 Make ComputerCraft modems placeable on energy cubes again. I think it broke when the nice model was added. 2014-01-03 00:28:34 +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
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
c8d765bde0 Merge pull request #772 from Vexatos/patch-1 
Update de_DE.lang
 2014-01-02 10:19:44 -08:00
Aidan
abb8b0a9c3 Merge pull request #773 from VeryBigBro/patch-6 
Update ru_RU.lang
 2014-01-02 10:19:40 -08:00
Aidan Brady
5da3b31455 Make CIC use sulfur instead of gunpowder as a backup resource, dynamic GUI title rendering to prevent escaping 2014-01-02 13:11:08 -05:00
Aidan Brady
00bbb9d5c4 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-01-02 13:00:15 -05:00
Aidan Brady
3990ab4f42 Have NEI plugin iterate over possible fuel stacks, register sulfur dust in oredict 2014-01-02 13:00:09 -05: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
a5e62bf7a9 Fixed factory connection issue 2014-01-01 20:02:10 -05:00
Aidan C. Brady
ea76a68112 Fix factory GUI support with sulfuric acid 2014-01-01 19:26:20 -05:00
Aidan C. Brady
c72f04b61b Fixed factory gas management bug 2014-01-01 19:07:14 -05:00
Ben Spiers
0385123a46 Unfudge that merge. 2014-01-01 23:35:13 +00:00
Ben Spiers
7236638d59 Clean up supportsUpgrades a bit 2014-01-01 23:13:04 +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
Aidan
a5e33d0158 Merge pull request #771 from VeryBigBro/patch-5 
Update ru_RU.lang
 2014-01-01 09:40:54 -08: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
Aidan
4f0b47a56f Merge pull request #769 from VeryBigBro/patch-4 
Update ru_RU.lang
 2014-01-01 00:22:54 -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 Brady
692a8a0412 Finished Chemical Infuser rendering, added in recipes for new machines (including Combiner which means there may be a tiny conflict if you’ve already started on the name change @unpairedbracket) 
Also…happy new year everyone :)
 2014-01-01 00:58:58 -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
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
Aidan C. Brady
371efa9ece Fix item render 2013-12-31 16:51:02 -05:00