Commit graph

197 commits

Author SHA1 Message Date
Aidan Brady
32a346633f Battery now charges/discharges items, fixed capacitor energy bar 2013-08-05 12:54:22 -04:00
Aidan Brady
bb9c3b6c32 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 12:36:07 -04:00
Aidan Brady
9055ae71d5 Round energy, fixed NBT, added new texture for battery when in multi block form 2013-08-05 12:35:56 -04:00
Calclavia
8dbef429f5 Finished multimeter model render 2013-08-05 12:33:09 -04:00
Calclavia
b7e391ce89 Fixed multimeter item render 2013-08-05 12:10:43 -04:00
Calclavia
5530ab352b Added model for multimeter 2013-08-05 11:59:14 -04:00
Aidan Brady
b0ffec41d3 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 11:56:52 -04:00
Aidan Brady
051d19be32 Fix multimeter GUI 2013-08-05 11:56:42 -04:00
Calclavia
d54f02b126 Added ability for handheld multimeter to store last detection 2013-08-05 11:39:45 -04:00
Aidan Brady
c7592ef4c6 Merge branches 'master' and 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 11:32:24 -04:00
Aidan Brady
6db24c8dd6 Tesla integration for Battery 2013-08-05 11:32:01 -04:00
Calclavia
2c5a034548 Some work on multimeter 2013-08-05 11:27:36 -04:00
Aidan Brady
d77d6292f6 Finished energy add/remove algorithms for Battery.
Signing off. Good work day today! :D
2013-08-05 03:49:00 -04:00
Aidan Brady
686642e6f5 Fixed Battery item render, fixed ListUtil.split() 2013-08-05 03:35:18 -04:00
Aidan Brady
a00acf06b5 Item ejecting! Still have a minor bug to fix. 2013-08-05 03:10:13 -04:00
Aidan Brady
ab262c9b54 Fixed crash when shift-clicking items 2013-08-05 02:45:44 -04:00
Aidan Brady
f5068bda2b Fixed Battery NBT loading 2013-08-05 02:38:04 -04:00
Aidan Brady
b44ea67b46 Lists > Sets in this situation 2013-08-05 02:08:37 -04:00
Aidan Brady
0d052c8090 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 01:29:47 -04:00
Aidan Brady
75b1a9804d Battery bugfixes 2013-08-05 01:29:39 -04:00
Calclavia
ee64d65d62 Prevented face from rendering when blocked by non-opaque block 2013-08-05 01:02:06 -04:00
Calclavia
aef0e8f44e Added capacitor charge to creative 2013-08-05 00:58:59 -04:00
Calclavia
6537a7b7ae Made capacitors render on battery block 2013-08-05 00:54:01 -04:00
Calclavia
91328615fa Added recipe for everything 2013-08-04 23:50:59 -04:00
Calclavia
ba5f23f540 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 23:45:36 -04:00
Aidan Brady
0134b505d2 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 23:45:08 -04:00
Aidan Brady
ae70542bbd Battery is mostly working! 2013-08-04 23:44:58 -04:00
Calclavia
d29252386a Fixed raytrace bug 2013-08-04 23:13:21 -04:00
Calclavia
9e1feca3e8 Inter-dimensional transfer working! 2013-08-04 22:56:45 -04:00
Calclavia
258afcd33f Added quantum tesla 2013-08-04 22:45:32 -04:00
Aidan Brady
e3ab3e67ea Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 22:32:46 -04:00
Aidan Brady
ccbaf105eb Work on battery GUI 2013-08-04 22:32:28 -04:00
Calclavia
01f871011f Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 22:07:04 -04:00
Calclavia
2a2dcb16df Fixed multimeter GUI bar 2013-08-04 22:06:57 -04:00
Aidan Brady
54b8800ff5 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 22:05:50 -04:00
Aidan Brady
a26a698b4b A bit of work on logistics 2013-08-04 22:05:35 -04:00
Calclavia
b4650a95f2 Added modular battery box click zones 2013-08-04 21:47:28 -04:00
Calclavia
f14f1ec50e Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 21:28:42 -04:00
Calclavia
c606fe0cd8 Fixed blocks breaking instantly 2013-08-04 21:28:29 -04:00
Aidan Brady
ab02a09159 Visible inventory logistical management (hopefully) complete 2013-08-04 21:27:56 -04:00
Calclavia
07ac511e17 Fixed Tesla zapping 2013-08-04 21:21:07 -04:00
Aidan Brady
0bb73d5183 Just about finished inventory management, onto logistics 2013-08-04 21:15:16 -04:00
Aidan Brady
afb563898a More inventory implementation 2013-08-04 20:39:25 -04:00
Aidan Brady
26393f8d72 Beginning work on inventory management 2013-08-04 20:18:40 -04:00
Aidan Brady
b4028d8fcb Fix crash when splitting inventories 2013-08-04 19:21:59 -04:00
Aidan Brady
c95031de2e Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 18:59:42 -04:00
Aidan Brady
1834bc09d8 Work on new (hopefully more efficient) multiblock system 2013-08-04 18:56:59 -04:00
Calclavia
48fee60770 Fixed path NPE 2013-08-04 18:22:33 -04:00
Calclavia
e189636464 Fixed EM Contractor link packets 2013-08-04 18:19:24 -04:00
Calclavia
797f50f84a Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-04 18:04:51 -04:00