Commit graph

239 commits

Author SHA1 Message Date
Calclavia
de0ad48a2d Added EMC Contractor multithreading 2013-08-05 17:20:08 -04:00
Aidan Brady
78bc4a666a Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 17:03:05 -04:00
Calclavia
b1babdaeec Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 17:02:15 -04:00
Calclavia
f70eef5e3a Made pink darker 2013-08-05 16:59:41 -04:00
Aidan Brady
bf500ae6dc More dynamic rendering! 2013-08-05 16:59:22 -04:00
Aidan Brady
4e35a9f6d5 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 16:50:31 -04:00
Aidan Brady
624700a0b4 More dynamic item rendering 2013-08-05 16:49:56 -04:00
Calclavia
104dc30e5a Fixed green color 2013-08-05 16:45:23 -04:00
Calclavia
f5790d85ce Fixed pink dye color 2013-08-05 16:43:11 -04:00
Calclavia
d9498069a3 Fixed colors 2013-08-05 16:39:53 -04:00
Calclavia
cef14e88d1 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 16:22:53 -04:00
Calclavia
a34ef725de Increased Tesla transfer rate 2013-08-05 16:22:26 -04:00
Aidan Brady
32317b4b68 Fixed laggy renderer 2013-08-05 16:21:58 -04:00
Aidan Brady
23b939d7aa Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 16:01:46 -04:00
Aidan Brady
0c2ea100d8 Battery now updates state on chunk load 2013-08-05 16:00:41 -04:00
Calclavia
ec8e259d0b Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 15:55:41 -04:00
Aidan Brady
66c94f9e14 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 15:54:43 -04:00
Aidan Brady
a726314370 Fixed packets :) 2013-08-05 15:53:54 -04:00
Calclavia
38cd248069 Fixed link name output 2013-08-05 15:50:50 -04:00
Calclavia
20fd0d2e46 Fixed stacking electrostatic linker 2013-08-05 15:48:21 -04:00
Calclavia
64bc122890 Fixed EM contractor not sucking things in 2013-08-05 15:48:08 -04:00
Calclavia
dce4307e03 Fixed recipes involving capacitor 2013-08-05 15:34:34 -04:00
Calclavia
e867ff03fa Changed EM Contractor to use metadata for direction for better performance. Take that Aidan! 2013-08-05 15:28:33 -04:00
Calclavia
cbb670370f Fixed server side EM velocity crash 2013-08-05 15:14:22 -04:00
Calclavia
edb5d4c958 Added Tesla battery withdraw ability 2013-08-05 14:19:00 -04:00
Calclavia
d1c9529ab9 Fixed #15 pathfinding going through contractors itself 2013-08-05 14:04:47 -04:00
Calclavia
6b5f8cbf14 Added base to EM Contractor thanks to Archadia 2013-08-05 13:53:26 -04:00
Calclavia
e09dc2c489 Clean up and reformat 2013-08-05 13:36:31 -04:00
Calclavia
747bbd4c3f Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 13:26:18 -04:00
Calclavia
f30bdb931b Made electric bolt slightly less random; resolves #13 2013-08-05 13:25:33 -04:00
Aidan Brady
dc735b7336 Removed tick handler 2013-08-05 13:25:10 -04:00
Calclavia
19208dd01a Added ability to left/right click capacitors into battery 2013-08-05 13:20:10 -04:00
Aidan Brady
daa52ba109 Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 13:17:47 -04:00
Aidan Brady
5b1a070664 Cells now render dynamically on battery 2013-08-05 13:16:39 -04:00
Calclavia
fd8806ffee Finished multimeter bounds 2013-08-05 13:07:32 -04:00
Calclavia
cafd17a9ac Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
Conflicts:
	src/resonantinduction/battery/TileEntityBattery.java
2013-08-05 13:02:31 -04:00
Aidan Brady
0de97ab6fa Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 12:54:32 -04:00
Aidan Brady
32a346633f Battery now charges/discharges items, fixed capacitor energy bar 2013-08-05 12:54:22 -04:00
Calclavia
86b9d9d4ec Tweaked some gameplay balance 2013-08-05 12:45:44 -04:00
Calclavia
b6e5e22725 Fixed capacitor being changed on crafted 2013-08-05 12:41:38 -04:00
Calclavia
2c023d4902 Fixed battery getting power without cells inside 2013-08-05 12:40:16 -04:00
Calclavia
43a4d4ab4c Merge branch 'master' of https://github.com/calclavia/Resonant-Induction 2013-08-05 12:37:51 -04:00
Calclavia
db5d1a002a Fixed multimeter detection wrong side 2013-08-05 12:37:27 -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