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 |
|
Calclavia
|
68b90336c8
|
Another attempt at fixing saving
|
2013-08-04 18:04:36 -04:00 |
|
Aidan Brady
|
a2d955d6a3
|
Fixed contractor spinning
|
2013-08-04 18:02:07 -04:00 |
|
Calclavia
|
869c6c1861
|
Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
|
2013-08-04 17:56:28 -04:00 |
|
Calclavia
|
fb4ed3aa3b
|
Fixed link not saving
|
2013-08-04 17:56:13 -04:00 |
|
Aidan Brady
|
7c9bc8bb8d
|
Added algorithm to split HashSets
|
2013-08-04 17:45:15 -04:00 |
|
Calclavia
|
fd3f60a3d5
|
Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
|
2013-08-04 13:02:06 -04:00 |
|
Calclavia
|
9ebbb2fb0c
|
Added EM Contractor coloring
|
2013-08-04 13:01:54 -04:00 |
|
Calclavia
|
54fd6b4d2f
|
Finished EM Contractor move
|
2013-08-04 12:53:58 -04:00 |
|
Calclavia
|
f5bae17e35
|
Added electrical path line
|
2013-08-04 12:43:41 -04:00 |
|
Aidan Brady
|
a34d9d86a9
|
Gave the Battery a model
|
2013-08-04 11:56:31 -04:00 |
|
Calclavia
|
b727502276
|
Made linking work
|
2013-08-04 11:33:42 -04:00 |
|
Calclavia
|
dc9cf65660
|
Fixed pathfinder NPE and EM Contractor model
|
2013-08-04 11:18:39 -04:00 |
|
Calclavia
|
1fd0bac321
|
Added battery model and renderer
|
2013-08-04 11:13:02 -04:00 |
|
Calclavia
|
98c15becad
|
Added EM contractor link and pathfind
|
2013-08-04 10:21:02 -04:00 |
|
Calclavia
|
43f770fd66
|
Added electrostatic linker
|
2013-08-04 10:20:45 -04:00 |
|
Calclavia
|
be5d59180c
|
Made ItemCoordLink parent class
|
2013-08-04 10:04:31 -04:00 |
|
Aidan Brady
|
4ddb716101
|
Work on cell implementation of Battery
(really signing off now)
|
2013-08-04 04:04:02 -04:00 |
|
Aidan Brady
|
ca44ee4cf4
|
I lied, I'm not signing off. Packets for Battery multiblock
|
2013-08-04 03:35:33 -04:00 |
|
Aidan Brady
|
796ab2eee2
|
Fixed cuboid algorithm! Multiblock now code-wise functions properly
Signing off. Night all!
|
2013-08-04 03:17:46 -04:00 |
|
Aidan Brady
|
935b257f51
|
The algorithm is not recognizing invalid cuboids :(
|
2013-08-04 03:02:19 -04:00 |
|
Aidan Brady
|
64706f7a37
|
More battery work, algorithm semi-working
|
2013-08-04 02:48:17 -04:00 |
|
Aidan Brady
|
bea61449b4
|
And yet more work.
|
2013-08-04 02:37:49 -04:00 |
|
Aidan Brady
|
c6eb7eba25
|
More work on battery multi block
|
2013-08-04 02:27:37 -04:00 |
|
Aidan Brady
|
dea370c0e3
|
Work on Battery Multiblock
|
2013-08-04 02:16:24 -04:00 |
|
Aidan Brady
|
1535e1de10
|
Merge branch
|
2013-08-04 00:12:20 -04:00 |
|
Aidan Brady
|
eb77e593d6
|
Began work on Multiblock battery
|
2013-08-04 00:11:06 -04:00 |
|
Calclavia
|
d094f0baf6
|
Finished A* Pathfinder
|
2013-08-04 00:04:16 -04:00 |
|
Calclavia
|
dc9d5da1a9
|
More work on pathfinder
|
2013-08-04 00:00:48 -04:00 |
|
Calclavia
|
ff78509019
|
Added basic findNode function
|
2013-08-03 23:53:13 -04:00 |
|
Calclavia
|
06e5fb1e7a
|
Start work on A* pathfinding algorithm
|
2013-08-03 23:46:29 -04:00 |
|
Aidan Brady
|
3539173e6b
|
Don't spin Contractor if game is paused
|
2013-08-03 23:03:15 -04:00 |
|
Aidan Brady
|
5fa79a9807
|
Re-added electricity :)
|
2013-08-03 22:49:03 -04:00 |
|
Aidan Brady
|
a57f8fb022
|
Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
|
2013-08-03 22:35:47 -04:00 |
|
Aidan Brady
|
f8091d1b15
|
Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
Conflicts:
src/resonantinduction/contractor/TileEntityEMContractor.java
src/resonantinduction/model/ModelEMContractor.java
src/resonantinduction/render/RenderEMContractor.java
|
2013-08-03 22:35:23 -04:00 |
|
Calclavia
|
4e4d6d2d18
|
Added set energy options
|
2013-08-03 22:29:56 -04:00 |
|
Aidan Brady
|
07d6380681
|
Cleanup
|
2013-08-03 22:25:57 -04:00 |
|
Calclavia
|
f6ab9e1f9b
|
Added capacitor
|
2013-08-03 22:23:06 -04:00 |
|
Calclavia
|
ee2dc80248
|
Added modular battery
|
2013-08-03 22:14:47 -04:00 |
|
Calclavia
|
7eaf73341b
|
Added handheld multimeter reading feature
|
2013-08-03 22:00:43 -04:00 |
|
Calclavia
|
f77f7387b7
|
Added block rendering for multimeter
|
2013-08-03 21:38:12 -04:00 |
|
Calclavia
|
50fe6c44d0
|
Added lightning to EM Contractor
|
2013-08-03 21:27:12 -04:00 |
|
Calclavia
|
37d9200af2
|
Added multimeter detection mechanism
|
2013-08-03 21:16:59 -04:00 |
|
Aidan Brady
|
6b94b4d05a
|
Polished off Contractor, just need to finish energy usage.
|
2013-08-03 21:09:49 -04:00 |
|
Aidan Brady
|
ca0fca1fa1
|
Merge branch 'master' of https://github.com/calclavia/Resonant-Induction
|
2013-08-03 19:58:32 -04:00 |
|