Aidan Brady
|
87de087df9
|
Typo fix
|
2014-02-15 15:25:37 -05:00 |
|
Aidan Brady
|
f18eea9a14
|
Step 2 of another Digital Miner overhaul
|
2014-02-15 15:01:17 -05:00 |
|
Aidan Brady
|
73be8c65d7
|
Step 1 of another Digital Miner refactor
|
2014-02-15 15:00:42 -05:00 |
|
Aidan Brady
|
1a179b914c
|
Fix Digital Miner text
|
2014-02-15 14:50:40 -05:00 |
|
Aidan Brady
|
1bf35e9314
|
Fix machine type bug
|
2014-02-15 13:24:34 -05:00 |
|
Aidan Brady
|
9ac1325b35
|
Revert "TEMP FIX for Wylker, will be rolled back for matured changes in v6"
This reverts commit 0b861f71af.
|
2014-02-14 19:04:06 -05:00 |
|
Aidan Brady
|
996b5fcf56
|
Final change for v6 release :)
|
2014-02-14 18:45:42 -05:00 |
|
Aidan C. Brady
|
b593c7c202
|
Updated IC2 API, added in option to disable particles/lighting updates on machines
|
2014-02-14 17:55:34 -05:00 |
|
Aidan C. Brady
|
27199c9721
|
Fix negative energy buffer issue
|
2014-02-14 17:45:51 -05:00 |
|
Aidan C. Brady
|
b2e9e03584
|
Redstone Block is now an infuse object
|
2014-02-14 17:41:34 -05:00 |
|
Aidan C. Brady
|
5b553c5fbc
|
Hopefully fixed CME
|
2014-02-12 19:13:51 -05:00 |
|
Aidan C. Brady
|
e9e4d381f2
|
Fixed teleported crash
|
2014-02-12 19:08:53 -05:00 |
|
Aidan C. Brady
|
cf73d1f2c0
|
A few tiny fixes
|
2014-02-12 19:05:43 -05:00 |
|
Aidan C. Brady
|
4c4f534e5b
|
Digital Miner overhaul - easier than I thought. Also cleanup.
|
2014-02-11 21:12:54 -05:00 |
|
Aidan
|
088d50d184
|
Merge pull request #1000 from tterrag1098/development
ItemProxies in player invs will now disappear instantly
|
2014-02-11 18:40:39 -05:00 |
|
tterrag1098
|
60664ef71b
|
Formatting derps
|
2014-02-10 22:49:40 -05:00 |
|
tterrag1098
|
3a8847bdc8
|
Add minor safeguard for ItemProxy's in player invs
|
2014-02-10 22:48:52 -05:00 |
|
tterrag1098
|
19c47c1a41
|
Merge pull request #1 from aidancbrady/development
Development
|
2014-02-10 22:42:56 -05:00 |
|
Aidan Brady
|
c05a2516b9
|
Preparing for DM overhaul
|
2014-02-10 21:59:18 -05:00 |
|
Aidan Brady
|
0904b4d7f6
|
Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development
|
2014-02-10 21:12:31 -05:00 |
|
Aidan Brady
|
28459b134e
|
Armored Jetpack…done. Also made Charcoal Blocks fuel sources
|
2014-02-10 21:10:30 -05:00 |
|
Aidan
|
f74ac247fb
|
Update build.properties
|
2014-02-10 20:34:44 -05:00 |
|
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 |
|