tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
791 commits 2 branches 0 tags 102 MiB
Commit graph

477 commits

Author SHA1 Message Date
Aidan C. Brady
59b945a33f Fixed Model3D textures, fixed error spam on world load, fixed Digital Miner breaking blocks on top, general code cleanup 2013-11-24 12:12:42 -06:00
Aidan C. Brady
de3ee34743 FIxed ObsidianTNT mapping 2013-11-24 08:27:52 -06:00
Aidan C. Brady
dfda7547cc Fix Obsidian Ingot recipe 2013-11-24 08:19:50 -06:00
Aidan C. Brady
d5af842037 Fix a few bugs in Factory and Configuration GUI 2013-11-24 07:53:14 -06:00
Aidan C. Brady
009ee3a885 Add shift-click support and configurable usage to Digital Miner 2013-11-23 21:25:37 -06:00
Aidan C. Brady
dca7663de9 Fix factories 2013-11-23 15:21:01 -05:00
Aidan C. Brady
a27582971b Neatened up Diversion Transporter code 2013-11-23 15:01:18 -05:00
Aidan C. Brady
a848b11582 Fixed crash with Electrolytic Separator 2013-11-23 14:44:28 -05:00
Aidan
5b690e9bfb Merge pull request #461 from pixlepix/master 
Logistical Diverter
 2013-11-23 11:44:03 -08:00
Aidan C. Brady
22c07254fd Purification, Compressing, and Combining factories :) 2013-11-23 14:36:50 -05:00
Aidan Brady
4a5df9f922 Fixed tesla texture 2013-11-23 10:42:23 -05:00
pixlepix
45b449078c Added CC peripheral support for digital miner 2013-11-23 09:04:05 -05:00
pixlepix
dc1743d517 Divertion transporter fixes, including name change 2013-11-23 07:28:01 -05:00
pixlepix
51225ba715 Logistical diverter texture 2013-11-23 07:28:01 -05:00
pixlepix
2ecb10cbca Added Logistical Diverter 2013-11-23 07:28:01 -05:00
Aidan Brady
4c68aa2ca2 Fix machines being able to be placed facing up or down 2013-11-23 00:23:56 -05:00
Aidan Brady
2ef3b1be6c Make that miner require a robit! 2013-11-23 00:10:57 -05:00
Aidan Brady
f5d620b6a0 Fix sorter auto-orient 2013-11-23 00:01:44 -05:00
Aidan Brady
10da5406de RF! :D 2013-11-22 23:36:18 -05:00
Aidan C. Brady
a9fde31c97 Fix client/server item accepting issue on contractor 2013-11-22 21:25:06 -05:00
Aidan C. Brady
0adc0dc75e Attempt to use my own unit system 2013-11-22 20:58:49 -05:00
Aidan C. Brady
a3d200291c GUI work... 2013-11-22 20:39:44 -05:00
Aidan C. Brady
649f128d76 Work on textures 2013-11-22 20:27:27 -05:00
Aidan C. Brady
cc46bebc43 Teslas are FIXED! :) 2013-11-22 20:00:18 -05:00
Aidan C. Brady
e44519dc7d A ton of bug fixes, working on fixing teslas 2013-11-22 19:32:06 -05:00
Aidan C. Brady
dc925798b0 Hopefully fixed crash 2013-11-22 12:09:04 -05:00
Aidan C. Brady
df70da8bd0 Fix another crash 2013-11-22 07:34:03 -05:00
Aidan Brady
ace1365d0f Aw yeah! Better GUI packets for Miner. Heading to bed guys, see ya tomorrow! 2013-11-21 22:30:01 -05:00
Aidan Brady
0e2d2917d1 Remove Capacitor and Empty Capacitor, fix mouses, made sorter and miner maintain configuration 2013-11-21 21:37:03 -05:00
Aidan Brady
5f2545d8e8 A few fixes and new mechanics 2013-11-21 20:31:28 -05:00
Aidan Brady
41eda67517 Fixed miner filter issue. 2013-11-21 19:37:13 -05:00
Aidan
c9ea74b013 Merge pull request #451 from pixlepix/master 
Made robit look up on chargepad
 2013-11-21 16:36:33 -08:00
pixlepix
72909b7657 Made robit look up on chargepad? 2013-11-21 19:27:39 -05:00
Aidan Brady
f53153cfd4 ANOTHER donator? Whoa! Thanks so much Greylocke :) 2013-11-21 19:17:32 -05:00
Aidan Brady
b7c7f58f2c Fix up Robit pickup AI, and update donator cape list! Thanks ejmiv89! :) 2013-11-21 19:06:22 -05:00
Aidan Brady
6ff12e2c81 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-21 18:57:17 -05:00
Aidan Brady
85ad41df74 Fixed teslas! 2013-11-21 18:57:07 -05:00
pixlepix
1e2603d5fb Added Robit Item Pickup. 2013-11-21 18:51:22 -05:00
Aidan Brady
57c16a0916 Don’t replace furnaces, that was for ModJam 2013-11-21 18:31:15 -05:00
Aidan Brady
25f1a72a16 Active management for that Miner. 2013-11-21 18:29:22 -05:00
Aidan Brady
323690ffdb Hopefully fixed tesseract outputting 2013-11-21 17:19:59 -05:00
Aidan Brady
796a5aa397 Fixed IC2/TE support. 2013-11-21 16:50:40 -05:00
Aidan C. Brady
d01d444753 This miner is pretty much done :) 2013-11-21 16:29:22 -05:00
Aidan C. Brady
1c674f4317 Some bounding block inventory management 2013-11-21 16:04:14 -05:00
Aidan C. Brady
68f3d28119 Bounding blocks for miner! 2013-11-21 14:35:33 -05:00
Aidan Brady
44ca9d1067 Start work on bounding blocks 2013-11-21 08:44:59 -05:00
Aidan Brady
890de9446b Model positioning fixes! Next is lasers and/or multiblock! 2013-11-20 21:17:23 -05:00
Aidan Brady
34f300cf6f Begin implementing that sexy model 
don’t recommend this build for personal use
 2013-11-20 20:28:06 -05:00
Aidan Brady
8ce5876200 Some new logistics, preparing for model 2013-11-20 19:36:39 -05:00
Aidan Brady
222ce67e83 Miner kinda works! 2013-11-20 18:51:45 -05:00
Aidan Brady
e33775fec9 Fix tiny filter issue 2013-11-20 18:28:09 -05:00
Aidan Brady
1f3a82c3f0 Miner work! Starting on actual operation algorithms. 2013-11-20 18:17:10 -05:00
Aidan C. Brady
789c5dbf45 Some work on algorithm 2013-11-20 16:12:54 -05:00
Aidan C. Brady
7b3edc142e GUI and networking fixes - I think the GUI is finished. 2013-11-20 15:15:02 -05:00
Aidan C. Brady
9673b9c7f8 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-20 11:01:27 -05:00
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