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

1584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Aidan
775da9d395 Update build.properties 2014-02-10 20:32:27 -05:00
Aidan
99c4fa8458 Update build.xml 2014-02-10 20:26:51 -05:00
Aidan C. Brady
661d421ffe Should be fixed 2014-02-09 12:52:18 -05:00
Aidan C. Brady
4d1b3d0721 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-08 19:45:53 -05:00
Aidan C. Brady
0618856b96 Fix GUI 2014-02-08 19:45:31 -05:00
Aidan C. Brady
24e7b0c450 Fix a few bugs 2014-02-08 19:41:52 -05:00
Aidan Brady
03ab491ce2 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-07 20:50:24 -05:00
Aidan Brady
d32a7f1e06 no message 2014-02-07 20:50:10 -05:00
Aidan C. Brady
b43044cc07 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 
Conflicts:
	common/mekanism/client/render/ModelCustomArmor.java
 2014-02-06 22:50:34 -05:00
Aidan C. Brady
c5634479cb Touch up on Free Runners positioning 2014-02-06 22:46:31 -05:00
Aidan Brady
f617e188f4 Quick fixes 2014-02-05 21:37:17 -05:00
Aidan Brady
81fed07f96 Start on Armored Jetpack 2014-02-05 21:25:05 -05:00
Aidan Brady
b821be5417 General enhancements 2014-02-05 20:22:43 -05:00
Aidan Brady
6e210f0730 Model positioning 2014-02-05 19:26:57 -05:00
Aidan C. Brady
879bc0e93d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-05 13:39:29 -05:00
Aidan C. Brady
2e325a0d31 Start on new Advanced Solar Generator model 2014-02-05 13:39:24 -05:00
Aidan Brady
6e1c428d32 Work on Atomic Disassembler positioning 2014-02-04 23:48:37 -05:00
Aidan Brady
afd954b510 Begin implementation of new AD model 2014-02-04 23:06:33 -05:00
Aidan Brady
316468e4ca Fix a compile error 2014-02-04 21:20:13 -05:00
Aidan
5d494a8d8d Merge pull request #963 from spookydonut/development 
Made Electrolytic Separators vent excess gas by default
 2014-02-04 14:48:53 -08:00
Aidan C. Brady
1a20773392 Added fancy Nether Steel Ore recipe 2014-02-04 12:24:39 -05:00
Aidan C. Brady
305f23d54d Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-04 08:15:26 -05:00
Aidan C. Brady
89e2279cb9 Fix a few bugs 2014-02-04 08:15:20 -05:00
spookydonut (Ash Wiren)
a15d964a8a Added UI elements for #962, making electrolytic separators dump excess gas 2014-02-04 17:07:37 +08:00
spookydonut (Ash Wiren)
6400dfe3bb Made Electrolytic Separators vent excess gas by default 2014-02-04 13:29:27 +08:00
Aidan Brady
c8002dda5f Fixed Adv. Electric Machine issue, fixed crash, Robits now display moving treads 2014-02-03 21:28:48 -05:00
Aidan Brady
8145b31997 Chemical Crystalizer can now output on right side. Note that it will not auto-eject. 2014-02-02 22:07:40 -05:00
Aidan C. Brady
6eb461f569 Added missing recipes 2014-02-02 11:05:09 -05:00
Aidan C. Brady
69a05815d7 Wow. Fixed a ridiculously dumb CME. 2014-02-01 22:37:22 -05:00
Aidan C. Brady
99b7172789 Updated donators list 2014-02-01 22:32:19 -05:00
Aidan C. Brady
efe03f6954 Friction Boots now have step assist 2014-02-01 22:02:50 -05:00
Aidan C. Brady
10844201d2 Touch up on Chemical Dissolution Chamber GUI title 2014-02-01 21:27:10 -05:00
Aidan C. Brady
c6cb70c9da Gas tanks can now dump gasses 2014-02-01 20:32:26 -05:00
Aidan C. Brady
9b1c605131 Fix a few Cardboard Box bugs 2014-02-01 19:20:10 -05:00
Aidan C. Brady
8f68bf8d3e Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-01 19:02:59 -05:00
Aidan C. Brady
30782caa8b Cardboard Box blacklist 2014-02-01 19:02:51 -05:00
Aidan
00c055dfdc Merge pull request #942 from Vexatos/patch-1 
Update de_DE.lang
 2014-02-01 15:17:15 -08:00
Aidan C. Brady
733bdd5691 Friction Boots? Done. 2014-02-01 16:38:09 -05:00
Aidan C. Brady
efe2502be1 Friction Boots - semi-working 2014-02-01 16:33:27 -05:00
Vexatos
b69c9af5d3 Update de_DE.lang 2014-02-01 22:11:22 +01:00
Aidan C. Brady
c3a1b6b3c5 Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development 2014-02-01 15:15:37 -05:00
Aidan C. Brady
fa55b3a8ce Chemical Crystalizer NEI module 2014-02-01 15:15:30 -05:00
Aidan Brady
3803bfde24 Add resources for Friction Boots 2014-02-01 15:04:37 -05:00
Aidan C. Brady
2085220637 Chemical Dissolution Chamber NEI module 2014-02-01 14:59:31 -05:00
Aidan C. Brady
04441968be Chemical Washer NEI module 2014-02-01 14:36:55 -05:00
Aidan C. Brady
228e550baa Spinning stuff! 2014-02-01 14:19:47 -05:00
Aidan C. Brady
214be2bbba Fix Electric Pump model, fix Chemical Crystalizer operation 2014-02-01 14:00:34 -05:00
Aidan C. Brady
eae1364b7e Polishing GUIs 2014-02-01 13:48:37 -05:00
Aidan C. Brady
4eeea3b0f3 More work 2014-02-01 12:58:22 -05:00
Aidan C. Brady
c0b470bf71 GUI work 2014-02-01 12:28:04 -05:00