Aidan C. Brady
|
14d557cbe5
|
Some work on things, got rid of version constants, they're supposed to differ per module.
|
2013-11-20 11:01:13 -05:00 |
|
Calclavia
|
f8e7363483
|
Fixed multimeter packet update
|
2013-11-20 21:23:42 +08:00 |
|
Calclavia
|
665b857b94
|
Changed the battery recipe
|
2013-11-20 20:40:58 +08:00 |
|
Calclavia
|
132dcef0f6
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 20:28:06 +08:00 |
|
Calclavia
|
7694967d40
|
Fixed #427 - Tesla coil having no recipe
|
2013-11-20 20:27:51 +08:00 |
|
Calclavia
|
e986b3e664
|
Can't believe Aidan never used constants for Mekanism's versions
|
2013-11-20 20:26:51 +08:00 |
|
Calclavia
|
49e19b6793
|
Copy and paste derp
|
2013-11-20 20:21:40 +08:00 |
|
Calclavia
|
ce458d2e77
|
Revert "Fixed #433 - Electric bolt render NPE"
This reverts commit 92993e832d .
|
2013-11-20 20:21:10 +08:00 |
|
Aidan Brady
|
85f759e5e6
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-20 07:20:38 -05:00 |
|
Aidan Brady
|
2d1dabd6b2
|
Fix a few crashes
|
2013-11-20 07:20:32 -05:00 |
|
Calclavia
|
92993e832d
|
Fixed #433 - Electric bolt render NPE
|
2013-11-20 20:18:12 +08:00 |
|
Aidan Brady
|
7f9acda277
|
Aw yeah. This GUI…is coming together.
|
2013-11-19 22:27:28 -05:00 |
|
Aidan Brady
|
515cbf38c8
|
Fixes!
|
2013-11-19 22:13:35 -05:00 |
|
Aidan C. Brady
|
fc1cb7926c
|
Added in some descriptive text to the GUI.
|
2013-11-19 20:15:03 -05:00 |
|
Aidan C. Brady
|
73bf81ceaa
|
GUI is coming together! Still need to add reset button and map button actions, but layout is there.
|
2013-11-19 19:30:56 -05:00 |
|
Aidan C. Brady
|
d02d0ceadf
|
GUI work, kinda functions, but not really
|
2013-11-19 18:56:53 -05:00 |
|
Aidan C. Brady
|
7a74fb86ba
|
More work!
|
2013-11-19 18:16:26 -05:00 |
|
Aidan C. Brady
|
87f5bbcde2
|
Work on networking and GUIs of Digital Miner
|
2013-11-19 17:39:16 -05:00 |
|
Aidan C. Brady
|
c9deba55df
|
Provide replace stacks
|
2013-11-19 15:38:18 -05:00 |
|
Aidan C. Brady
|
3939000190
|
More work!
|
2013-11-19 12:29:50 -05:00 |
|
Aidan C. Brady
|
86b6474f35
|
Beginning foundations of Digital Miner.
|
2013-11-19 12:13:37 -05:00 |
|
Aidan Brady
|
ba66b6fc9f
|
Work on miner!
|
2013-11-18 22:15:03 -05:00 |
|
Aidan C. Brady
|
995207bcab
|
Start work on Miner, make the Bin only eject items when front side is clicked!
|
2013-11-18 15:33:14 -05:00 |
|
Aidan C. Brady
|
2594918bee
|
Double-click inserting on Bins
|
2013-11-18 14:50:59 -05:00 |
|
Aidan Brady
|
52d42e99f2
|
Fix ItemProxy leak
|
2013-11-17 23:37:02 -05:00 |
|
Aidan Brady
|
cc5d4281a2
|
Fix container item issue
|
2013-11-17 20:14:00 -05:00 |
|
Aidan Brady
|
0e0594a69b
|
Electric Chest charges when in inventory
|
2013-11-17 19:56:16 -05:00 |
|
Aidan Brady
|
a63a8902f2
|
Sounds should be fixed.
|
2013-11-17 19:25:52 -05:00 |
|
Aidan Brady
|
f988c54134
|
Hopefully the final fix
|
2013-11-17 19:16:40 -05:00 |
|
Aidan Brady
|
147fb7609d
|
Try removing extra url junk
|
2013-11-17 19:07:18 -05:00 |
|
Aidan Brady
|
40dd6798ea
|
Attempted sound fixes
Guaranteed not to work :)
|
2013-11-17 19:03:44 -05:00 |
|
Aidan Brady
|
6a4750f90b
|
Hopefully fixed sounds…
|
2013-11-17 13:39:40 -05:00 |
|
Aidan Brady
|
8095eb206c
|
Fix textures, hopefully fix sounds
|
2013-11-17 13:31:56 -05:00 |
|
Aidan Brady
|
8a79352563
|
Debugging sound system
|
2013-11-17 13:23:19 -05:00 |
|
Aidan Brady
|
17d36cad4d
|
Fixes and enhancements for TE
|
2013-11-17 10:55:20 -05:00 |
|
Aidan Brady
|
ae0edd50dc
|
Fix Universal Cable TE support, fix build.xml
|
2013-11-16 19:08:47 -05:00 |
|
Aidan Brady
|
67db8c522a
|
Fix TE support :)
|
2013-11-16 18:56:01 -05:00 |
|
Aidan Brady
|
e9382e64a9
|
Fixes!
|
2013-11-16 17:23:50 -05:00 |
|
Aidan C. Brady
|
f2fd5c382f
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-16 16:55:27 -05:00 |
|
Aidan C. Brady
|
57b1343311
|
Batteries are less buggy and more efficient
|
2013-11-16 16:55:20 -05:00 |
|
Aidan Brady
|
a2f667baf5
|
Fixed! :D
|
2013-11-16 13:38:34 -05:00 |
|
Aidan C. Brady
|
5954d51ad4
|
TE item support fixes
|
2013-11-16 12:56:43 -05:00 |
|
Aidan C. Brady
|
0616f28950
|
Fix test build
|
2013-11-16 12:49:41 -05:00 |
|
Aidan C. Brady
|
43440ebc4e
|
Register Induction module :)
|
2013-11-16 12:30:40 -05:00 |
|
Aidan C. Brady
|
19b6d30f4c
|
Fix crash
|
2013-11-16 12:27:43 -05:00 |
|
Aidan C. Brady
|
cc48b614ba
|
Remove wire
|
2013-11-16 12:26:49 -05:00 |
|
Aidan C. Brady
|
dc59bebc33
|
Fixed EM Contractor
|
2013-11-16 12:12:17 -05:00 |
|
Aidan C. Brady
|
15e3369f15
|
Fix TE crash (temp)
|
2013-11-16 11:06:17 -05:00 |
|
Aidan C. Brady
|
ed637e4eed
|
Follow Mekanism naming standards
|
2013-11-16 11:05:04 -05:00 |
|
Aidan C. Brady
|
53323279c7
|
MekanismInduction module - done!
Still need to configure the build
|
2013-11-16 10:21:37 -05:00 |
|
Aidan C. Brady
|
3d4625ddb9
|
Block-ID & Metadata based machine types, preparing for RI merge
|
2013-11-15 14:59:26 -05:00 |
|
Aidan C. Brady
|
3193f786cd
|
Official Redstone Flux support complete!
(As far as I know at least)
|
2013-11-15 12:06:03 -05:00 |
|
Aidan Brady
|
ec98b19ffb
|
Begin work on official TE2 integration :)
(Items done!)
|
2013-11-14 21:58:32 -05:00 |
|
Aidan Brady
|
8101ee2e26
|
A few fixes
|
2013-11-14 16:31:02 -05:00 |
|
Aidan C. Brady
|
be3063def5
|
Minor rendering enhancements
|
2013-11-14 08:12:09 -05:00 |
|
Aidan C. Brady
|
33283f5428
|
GL_LIGHTING
|
2013-11-14 07:48:18 -05:00 |
|
Aidan Brady
|
a29b637a0a
|
Minor tool cleanups
|
2013-11-13 22:43:58 -05:00 |
|
Aidan Brady
|
d08c6da830
|
Fixed tool harvest levels
|
2013-11-13 17:21:00 -05:00 |
|
Aidan Brady
|
c209f8233a
|
Bins are done :)
|
2013-11-13 16:19:41 -05:00 |
|
Aidan C. Brady
|
c9b5c7b51f
|
Some work on rendering, fixed sound error
|
2013-11-13 14:59:11 -05:00 |
|
Aidan C. Brady
|
f24c12044d
|
Merge branches 'master' and 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-13 08:12:34 -05:00 |
|
Aidan C. Brady
|
b04ff8d5cc
|
Bins only have accessible slots on top and bottom
|
2013-11-13 08:12:25 -05:00 |
|
Aidan Brady
|
4d55db7a73
|
Some work on Bin item rendering
|
2013-11-12 22:43:06 -05:00 |
|
Aidan C. Brady
|
8e08c9adb8
|
Once and for all fixed ConcurrentModificationException
|
2013-11-12 20:19:06 -05:00 |
|
Aidan C. Brady
|
3b64a043df
|
Bins can eject and accept items in block form, transporter support untested
|
2013-11-12 20:14:21 -05:00 |
|
Aidan C. Brady
|
1e336047d2
|
Bin block-based inventory work
|
2013-11-12 19:18:22 -05:00 |
|
Aidan C. Brady
|
e6ed263aa3
|
More bin work! :D
|
2013-11-12 18:42:55 -05:00 |
|
Aidan C. Brady
|
fe0631844b
|
Some work on Bins
|
2013-11-12 16:45:48 -05:00 |
|
Aidan C. Brady
|
42fe1f3d69
|
Bin inventory management works! I have no idea how I managed this...
|
2013-11-12 11:01:16 -05:00 |
|
Aidan Brady
|
2a4a1cd291
|
Some more work on Bin crafting management. Don’t know if this is gonna work guys…
|
2013-11-11 23:57:33 -05:00 |
|
Aidan Brady
|
8cec8af952
|
Perhaps fixed a few bugs
|
2013-11-11 23:19:51 -05:00 |
|
Aidan Brady
|
80097e4d1b
|
Some work on bins, currently crashing if you try to craft
|
2013-11-11 22:52:12 -05:00 |
|
Aidan Brady
|
1ac243f091
|
Work on bins! :)
|
2013-11-11 19:27:36 -05:00 |
|
Aidan Brady
|
f6704dc5ea
|
Added name for bins, fixed IC2 bug, hopefully fixed ConcurrentModificationException
|
2013-11-11 17:23:14 -05:00 |
|
Aidan C. Brady
|
9c53f1be66
|
Some work on bins, fix tank bug
|
2013-11-11 17:08:13 -05:00 |
|
Aidan C. Brady
|
4b5c8498a3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-11 14:38:03 -05:00 |
|
Aidan C. Brady
|
3c0c5bef0d
|
Major Universal Cable improvements, started work on Bin
|
2013-11-11 14:37:56 -05:00 |
|
Aidan Brady
|
5ad16564a3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-10 19:35:52 -05:00 |
|
Aidan Brady
|
e277ee36c0
|
Fix some pathfinder bugs
|
2013-11-10 19:35:45 -05:00 |
|
Aidan C. Brady
|
99f53a1322
|
Some fancy sounds and tooltips
|
2013-11-10 18:54:30 -05:00 |
|
Aidan Brady
|
cc57fad0c2
|
Once again rewrote pathfinder. Idle paths are still fairly CPU intensive
|
2013-11-10 12:27:58 -05:00 |
|
Aidan Brady
|
dfd2985357
|
Transporters first try to send the item back home before idling
|
2013-11-09 15:30:30 -05:00 |
|
Aidan Brady
|
5a08cb1b90
|
Fix a possible crash
|
2013-11-09 10:56:47 -05:00 |
|
Aidan C. Brady
|
9883c9535c
|
Rest index when mode switched
|
2013-11-08 11:15:52 -05:00 |
|
Aidan C. Brady
|
51ad429973
|
Coming along with round robin mode :)
|
2013-11-08 11:13:51 -05:00 |
|
Aidan C. Brady
|
7cc72e65b3
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-08 07:53:40 -05:00 |
|
Aidan C. Brady
|
8f33094e10
|
Start on RR algorithm
|
2013-11-08 07:53:32 -05:00 |
|
Aidan Brady
|
1aec33d8ec
|
Added configuration option to turn off strict input colors
|
2013-11-07 21:27:12 -05:00 |
|
Aidan Brady
|
7053f4a30a
|
Whoops!
|
2013-11-07 19:17:24 -05:00 |
|
Aidan Brady
|
9fdcb13faa
|
Gas Tank recipe shows up in NEI
|
2013-11-07 19:15:58 -05:00 |
|
Aidan Brady
|
c02c53475d
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-07 16:59:43 -05:00 |
|
Aidan Brady
|
1df2209f25
|
Use proper obfuscation
|
2013-11-07 16:59:37 -05:00 |
|
Aidan C. Brady
|
d1089148f9
|
Don't accept a max over 64
|
2013-11-07 09:16:11 -05:00 |
|
Aidan Brady
|
b6446032ae
|
Attempt to clean up pathfinder
|
2013-11-07 08:47:18 -05:00 |
|
Aidan Brady
|
86e920fc0b
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-11-06 22:37:48 -05:00 |
|
Aidan Brady
|
daeb09c7fd
|
Fix Energy Cubes up/down render
|
2013-11-06 22:37:41 -05:00 |
|
Aidan C. Brady
|
67e2672197
|
Fix a few issues with min/max
|
2013-11-06 21:33:41 -05:00 |
|
Aidan Brady
|
1f59e441b8
|
Fix a few things
|
2013-11-06 19:44:52 -05:00 |
|
Aidan Brady
|
44addd9c75
|
Untested max/min support
|
2013-11-06 19:32:00 -05:00 |
|
Aidan Brady
|
8fdfe8d1ea
|
Items render smaller
|
2013-11-06 17:52:30 -05:00 |
|