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

395 commits

Author SHA1 Message Date
Aidan C. Brady
a204df448f Work on jetpacks 2013-12-05 15:50:38 -05:00
Aidan Brady
6cc198cf0b Bins are nice to hoppers now. 2013-12-04 21:55:56 -05:00
Aidan Brady
38dda1d18e Fix name, add a few more particle effects 2013-12-04 20:01:27 -05:00
Aidan Brady
64f681c263 Jetpack work! 2013-12-04 19:14:27 -05:00
Aidan Brady
aca0692cec Fix a few jetpack things 2013-12-04 17:22:00 -05:00
Aidan Brady
bf9d48d86f Work on jetpacks - specifically networking fixes and sounds! 2013-12-04 16:53:58 -05:00
Aidan C. Brady
2914a4201d Fix a few bugs, work on jetpack networking 2013-12-04 15:43:03 -05:00
Aidan Brady
7182d07cbd Bugfixes and the beginnings of jetpacks! 2013-12-03 23:36:06 -05:00
Aidan Brady
1cfdd805f3 Work on jetpack 2013-12-03 21:49:12 -05:00
Aidan Brady
e9b18c1a35 Cleanup 2013-12-03 18:00:06 -05:00
Aidan Brady
8f4ac31871 Minor cleanup 2013-12-03 17:46:48 -05:00
Aidan Brady
afe85f9215 Fix some pesky bugs and crashes 2013-12-03 16:56:03 -05:00
Aidan C. Brady
b60d6c172f Fix pressurized tube render 2013-12-03 16:23:08 -05:00
Aidan C. Brady
ef8b6c1c78 Fix gas render in mech pipe 2013-12-03 11:24:23 -05:00
Aidan C. Brady
9a4147ab7c Add TE and UE support to multipart cables 2013-12-03 11:03:03 -05:00
Aidan C. Brady
5dc8d2fc80 Multipart work 2013-12-03 10:54:50 -05:00
Aidan C. Brady
09b3a98a2a Work on multipart 2013-12-03 08:42:13 -05:00
Aidan Brady
50b7870388 A few attempts to get multipart working. @unpairedbracket, I don’t know what the hell I’m doing, you’re gonna need to go over this. 2013-12-02 22:14:21 -05:00
Aidan Brady
5d8e21b776 Merge branch 'master' of https://github.com/aidancbrady/Mekanism into multipart-experimental-new 
Conflicts:
	common/mekanism/api/gas/GasNetwork.java
	common/mekanism/api/gas/GasTransmission.java
	common/mekanism/api/transmitters/DynamicNetwork.java
	common/mekanism/client/EnergyClientUpdate.java
	common/mekanism/client/FluidClientUpdate.java
	common/mekanism/client/GasClientUpdate.java
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
	common/mekanism/common/EnergyNetwork.java
	common/mekanism/common/FluidNetwork.java
	common/mekanism/common/InventoryNetwork.java
	common/mekanism/common/Mekanism.java
	common/mekanism/common/item/ItemConfigurator.java
	common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
	common/mekanism/common/tileentity/TileEntityMechanicalPipe.java
	common/mekanism/common/tileentity/TileEntityPressurizedTube.java
	common/mekanism/common/tileentity/TileEntityTransmitter.java
	common/mekanism/common/tileentity/TileEntityUniversalCable.java
	common/mekanism/common/util/CableUtils.java
	resources/assets/mekanism/textures/blocks/LiquidEnergy.png.mcmeta
 2013-12-02 21:45:40 -05:00
Aidan Brady
dc8a00a140 Fix a few issues 2013-12-02 21:37:11 -05:00
Aidan Brady
75cccf96a8 Slightly speed up Digital Miner 2013-12-02 18:54:21 -05:00
Aidan C. Brady
57caab2062 Wire fixes 2013-12-02 17:04:41 -05:00
Aidan C. Brady
4a499d6dac Fix tank rendering, make Configurator serve as a BuildCraft wrench 2013-12-02 07:55:14 -05:00
Aidan Brady
5eba673468 Fixed Obsidian TNT render 2013-12-02 07:19:22 -05:00
Aidan Brady
7ebd132b6e Fixed teslas, merged Electrostatic Linker into Configurator 2013-12-01 14:03:00 -05:00
Aidan Brady
f55d3ac874 Added Factory input slot distribution, configurable voice ports, fixed several bugs 2013-12-01 12:38:34 -05:00
Aidan Brady
199ce13dcd Re-add EnumColor to API! 2013-12-01 00:03:40 -05:00
Aidan Brady
5d949ec959 Fixed API for @micdoodle8 2013-11-30 23:19:24 -05:00
Aidan Brady
1be0d218af Final fix for now - fixed electric machine GUIs 2013-11-30 12:48:22 -05:00
Aidan Brady
a4ab6db57b Fixes! 2013-11-30 12:29:49 -05:00
Aidan Brady
0c618a1cf3 Localization & gas fixes 2013-11-30 11:31:18 -05:00
Aidan Brady
ba32a2b112 More localization support! 2013-11-30 00:43:54 -05:00
Aidan Brady
b224a01f39 Work on localization support, move around some API classes to make better compatibility 2013-11-30 00:28:02 -05:00
Aidan Brady
686cca5032 A few fixes and enhancements 2013-11-29 21:31:39 -05:00
Aidan Brady
0f61c5d50c A few fixes, and fancy Configurator GUI hovering! 2013-11-29 19:11:07 -05:00
Aidan Brady
3d167922be Add IDeepStorageUnit support 2013-11-29 15:39:37 -05:00
Aidan Brady
20162970d8 Fixes! 2013-11-29 13:04:39 -05:00
Aidan Brady
82bae6e4bd Rendering fixes! 2013-11-28 22:20:24 -05:00
Aidan Brady
00b4c6f3e3 Rendering and transmitter performance enhancements, finish Rotary Condensentrator for the most part 2013-11-28 21:43:53 -05:00
Aidan Brady
ccae995242 Work on Rotary Condensentrator, fixed an issue with factories 2013-11-28 16:01:23 -05:00
Aidan Brady
fb3aa53eaf Fix several bugs! 2013-11-28 10:13:06 -05:00
Aidan Brady
98e864cd8d Work on that Rotary Condensentrator! 2013-11-27 23:42:54 -05:00
Aidan Brady
419a295096 Work on Rotary Condensentrator, fix IC2 energy integration (mostly) 2013-11-27 18:17:44 -05:00
Aidan Brady
22fe896bcd Finish multi-ID machine support 2013-11-27 16:17:10 -05:00
Aidan Brady
96ba50a673 Many fixes! 2013-11-27 13:24:13 -05:00
Aidan Brady
b950960aea Dynamic Tanks are now 300% better. 2013-11-26 22:44:14 -05:00
Aidan Brady
dacc68e6c6 Gas API completely overhauled. Sorry @micdoodle8 :( 
General cleanup, pressurized tubes are 40 times more efficient, a few enhancements, Miners balanced.
 2013-11-26 20:11:26 -05:00
Aidan Brady
e2e7274cd6 Fix a few bugs. Signing off, see you all later! 2013-11-25 18:23:24 -05:00
Aidan Brady
e6016d7341 Fix item rendering in transporters 2013-11-25 18:10:21 -05:00
Aidan Brady
19feb2e602 Fixes by the dozen 2013-11-25 16:34:59 -05:00
Aidan Brady
d0253444c1 Tiny cleanup, off to bed. Tomorrow I implement a more advanced transporter system. 2013-11-25 00:14:56 -05:00
Aidan Brady
a360255f63 Greatly improve performance of transmitter networks, improved logistics of Mechanical Pipe 2013-11-25 00:00:26 -05:00
Aidan C. Brady
fea5e8dab7 Pressurized Tubes now render gas in connected block bounds dynamically 2013-11-24 16:01:35 -06:00
Aidan C. Brady
afae26f9b8 Rendering enhancements! Mechanical Pipes now function better and use the large Transmitter model. 2013-11-24 15:44:16 -06:00
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
a27582971b Neatened up Diversion Transporter code 2013-11-23 15:01:18 -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
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 C. Brady
0adc0dc75e Attempt to use my own unit system 2013-11-22 20:58:49 -05:00
Aidan C. Brady
e44519dc7d A ton of bug fixes, working on fixing teslas 2013-11-22 19:32:06 -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 C. Brady
68f3d28119 Bounding blocks for miner! 2013-11-21 14:35:33 -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
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
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
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
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 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 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 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
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 C. Brady
c9b5c7b51f Some work on rendering, fixed sound error 2013-11-13 14:59:11 -05:00
Aidan Brady
4d55db7a73 Some work on Bin item rendering 2013-11-12 22:43:06 -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 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
99f53a1322 Some fancy sounds and tooltips 2013-11-10 18:54:30 -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
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
daeb09c7fd Fix Energy Cubes up/down render 2013-11-06 22:37: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
Aidan Brady
51813050b0 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-11-05 20:35:05 -05:00
Aidan Brady
961537a560 Revert to old Crusher texture 2013-11-05 20:35:02 -05:00
Aidan C. Brady
f27381453c Updated BuildCraft API, implemented full-fledged BC energy support, allowed Logistical Transporters to connect to BuildCraft machines, allowed Logistical Transporters to output to double chests, fixed energy leak 2013-11-05 20:07:38 -05:00
Aidan C. Brady
e2e9c791a2 Fix robit render! 2013-11-05 07:49:26 -05:00
Aidan Brady
1ff600b4a9 Added configurable restrictive input colors to all configurable machines, added some dandy sound effects 2013-11-04 21:11:09 -05:00
Aidan Brady
d825154bf6 Fixed Pressurized Tube connection render to Gas Tanks 2013-11-04 16:03:08 -05:00
Aidan C. Brady
99a603549a BioGenerator fancy biofuel render :D 2013-11-04 15:39:49 -05:00
Aidan Brady
01a6174fdb Lots of things! 2013-11-03 16:54:33 -05:00
Aidan Brady
c3fa020561 New Electric Pump model! 2013-11-03 12:07:23 -05:00
Aidan Brady
6d734c26e3 New models and fixes! 2013-11-03 11:38:36 -05:00
Aidan Brady
65012d8427 Fix up inventory insert calculation 2013-11-03 00:14:54 -04:00
Aidan Brady
dcea9fa8f5 Item rendering :D 2013-11-02 21:19:01 -04:00
Aidan Brady
64fe3a21ea Fix typo, start work on fancy Energy Cube rendering :) 2013-11-02 21:07:55 -04:00
Aidan Brady
d1a1e3375a New Metallurgic Infuser model, more efficient active state management 2013-11-02 19:06:56 -04:00
Aidan Brady
2a73dc3332 Gave the Solar Generator a new model 2013-11-02 12:00:29 -04:00
Aidan C. Brady
289a2ee227 Configurable machine output colors 2013-11-02 01:31:32 -04:00
Aidan Brady
799142198a Fixed ridiculous client updates when GUI is open, fancy active sorter rendering, sorter eject sound effect :) 2013-11-01 23:51:10 -04:00
Aidan Brady
8db9c734d7 Sorter no longer requires energy, gave sorter new fancy model, improved the way items retreat from dead ends 2013-11-01 22:36:06 -04:00
Aidan C. Brady
cb30b11d64 Killed the rest of the references 2013-11-01 11:38:33 -04:00
Aidan C. Brady
91a8839203 Deleted Theoretical Elementizer, Weather Orb, and Steve's Stopwatch. They are no longer fitting for Mekanism's goal. 2013-11-01 11:33:00 -04:00
Aidan C. Brady
f0b6799409 Machines eject into transporters. 2013-10-31 14:46:14 -04:00
Aidan C. Brady
a00a557f2b Preload sounds on game startup, immediately fire updateScreen() on OreDict filter calculation, added restriction transporter recipe 2013-10-31 14:26:04 -04:00
Aidan C. Brady
fa92b707c9 Immediately load stacks if new filter calculation performed 2013-10-30 23:54:29 -04:00
Aidan C. Brady
abe549bf13 Started some work on more filter tab information. 2013-10-30 23:48:50 -04:00
Aidan Brady
04d9b3dc68 Some fixes 2013-10-30 20:35:11 -04:00
Aidan C. Brady
656f74983f Lots of progress on ejectors and GUIs 2013-10-30 15:22:43 -04:00
Aidan C. Brady
e155dfd17f Logistical Sorters use energy 2013-10-29 19:17:37 -04:00
Aidan C. Brady
4962dd62b3 Fix silly GUI crash 2013-10-29 18:20:34 -04:00
Aidan C. Brady
9496f7dfa3 Rewrote pathfinder, added in Restrictive Transporters, added option to have null color in filters, added default outputting filter for sorter 
whoo!
 2013-10-29 18:13:30 -04:00
Aidan Brady
001ce431dc Scrolling :) 
Next is adding something similar to RP's "restriction tube!"
 2013-10-28 21:08:37 -04:00
Aidan C. Brady
2f3160c986 Better packet management for Logistical Transporters, smoother-looking item movement 2013-10-28 14:42:28 -04:00
Aidan C. Brady
d8a4ecb986 Don't launch VoiceClient unless VoiceServerEnabled is set to true 2013-10-28 07:16:22 -04:00
Aidan Brady
a63573d80f Added transporter recipe, items now drop when necessary 2013-10-27 19:27:33 -04:00
Aidan C. Brady
cb555e90a6 Filters are now editable by GUI! 2013-10-27 18:24:16 -04:00
Aidan C. Brady
a500d0f592 Edit/delete filter packets 2013-10-27 17:47:17 -04:00
Aidan C. Brady
5e7c01c1af Client/server GUI communication logistics 2013-10-27 17:29:34 -04:00
Aidan C. Brady
f60106f0e9 Filter panel buttons render! 2013-10-27 15:00:22 -04:00
Aidan C. Brady
4272c4cb6d Fix up custom slot render, got scroll bar working 2013-10-27 11:44:19 -04:00
Aidan Brady
340ccd1e87 Slightly better packet management, removed Control Panel 2013-10-27 00:08:39 -04:00
Aidan Brady
f4ced367cd Add option to disable voice server 2013-10-26 23:55:11 -04:00
Aidan Brady
0bab44a522 Fixes, filters technically work now! 2013-10-26 23:46:39 -04:00
Aidan Brady
9b378f1fff Merge branch 'master' of https://github.com/aidancbrady/Mekanism 2013-10-26 23:23:14 -04:00
Aidan Brady
3dab655328 Fix possible NPE 2013-10-26 23:23:11 -04:00
Aidan C. Brady
4a042cfdc2 Some work on networking logistics of GUI 2013-10-26 20:23:38 -04:00
Aidan C. Brady
a8d6386bb5 GUIs are cool :D 2013-10-26 19:04:33 -04:00
Aidan C. Brady
3a9a518188 Major GUI work! 2013-10-26 13:25:51 -04:00
Aidan Brady
51f24f058a Worked on that GUI, I think I've got down how this is gonna work 2013-10-26 00:02:57 -04:00
Aidan Brady
8bb6b7ac43 Merge branch 'master' of https://github.com/aidancbrady/Mekanism 
Conflicts:
	common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
 2013-10-25 21:36:33 -04:00
Aidan Brady
b405c42e2f Remove useless InventoryNetwork 2013-10-25 21:34:55 -04:00
Aidan C. Brady
b8935f8f7a Started on sorter GUI! 2013-10-25 18:08:13 -04:00
Aidan C. Brady
5a748c5ff6 More work on the Logistical Sorter! 2013-10-25 08:51:13 -04:00
Aidan C. Brady
51289b82c2 Made base code for Logistical Sorter, this may end up being more complex than the transporters themselves. 2013-10-25 00:23:38 -04:00
Aidan C. Brady
609d9c5d17 Fixed server connection issue! 2013-10-24 17:14:09 -04:00
Aidan C. Brady
61f8a06d48 Fixed pathfinding, hopefully fixed crash and build failure 2013-10-24 11:38:23 -04:00
Aidan C. Brady
ab8361f9e8 Just about finished rendering! :D 2013-10-23 20:34:33 -04:00
Aidan C. Brady
9fabab18a3 Just about done with rendering, next steps are final bug fixes and inventory management implementations 2013-10-22 21:13:23 -04:00
Aidan C. Brady
89eda12200 Got more things working! 2013-10-22 11:08:28 -04:00
Aidan C. Brady
c7dcea6a06 Rendering is partially-functional; I have an idea to make this more efficient, will do later 2013-10-22 07:54:09 -04:00
Aidan C. Brady
33c8f960f3 Some work on rendering, still really incomplete 2013-10-21 23:46:24 -04:00
Aidan C. Brady
ed5c30fb0a More work, fixing client crashes 2013-10-21 23:03:54 -04:00
Aidan Brady
4b82ab6cc1 Work on transporters, don't use them unless you like buggy item transport pipes that currently do nothing 2013-10-20 22:47:20 -04:00
Aidan C. Brady
5b44e0f409 Synchronized network code, should be thread safe. 2013-10-20 00:04:11 -04:00
Aidan C. Brady
e150df8743 Fixed NEI, fixed TNT dupe 2013-10-19 12:55:21 -04:00
Aidan C. Brady
8c51e4dd25 Fixed possible VoiceInput crash 2013-10-19 12:35:55 -04:00
Aidan Brady
61d046b518 Hopefully fixed walkie talkies 2013-10-18 20:05:47 -04:00
Aidan Brady
d8a806ebab Debugging walkie talkies, don't use this build unless you like console spam 2013-10-18 19:09:08 -04:00
Aidan C. Brady
0350eef398 Minor changes 2013-10-18 07:33:27 -04:00
Aidan C. Brady
1b717267f3 Moved client-sensitive info over to MekanismClient 2013-10-14 23:36:07 -04:00
Aidan C. Brady
c0651a9377 Fixed walkie talkies stacking, they now glow when in on state 2013-10-14 16:13:32 -04:00
Aidan C. Brady
15cba39b30 Fixed capes :) 2013-10-14 15:54:10 -04:00
Aidan C. Brady
9d94e55ece Hopefully fixed crash 2013-10-14 14:59:48 -04:00
Aidan C. Brady
fb2be7df86 More cleanups, now to update to forge build 931 2013-10-14 14:25:04 -04:00
Aidan C. Brady
5dbfd15a0e Cleaned up code 2013-10-14 14:08:15 -04:00
Aidan C. Brady
0feba0d9b3 Fixed key handler, added complete keybind support, added proper error messages, more work on walkie talkies. 2013-10-14 13:27:38 -04:00
Aidan C. Brady
cafe2a7dfb Much more server work 2013-10-14 12:44:07 -04:00
Aidan C. Brady
fbedc1915f More core work 2013-10-13 23:27:49 -04:00
Aidan C. Brady
34f1053354 The beginnings of a voice server 2013-10-13 22:50:21 -04:00
Aidan C. Brady
0d7b2414ce Walkie Talkie foundation! :D 2013-10-13 12:31:26 -04:00
Ben Spiers
3c73914337 Merge branch 'master' of github.com:aidancbrady/Mekanism 2013-10-12 15:39:01 +01:00
Aidan C. Brady
9735363dc1 Update IC2 API, minor enhancements and fixes 2013-10-08 18:06:25 -04:00
Aidan C. Brady
155978aefd Forgot to commit change! 2013-10-08 17:47:45 -04:00
Aidan C. Brady
bf1150e2cb Fixed minor GUI issues, recipe type interface is now a GuiElement 
Oh, I'm not dead btw
 2013-10-08 17:47:03 -04:00
Ben Spiers
132306ed76 Multipart and everything 2013-10-03 00:10:20 +01:00
Ben Spiers
e05479a909 Update every applicable API, remove some unused imports 2013-09-30 22:37:16 +01:00
Ben Spiers
a4222a86f0 Update obf 
Conflicts:
	common/mekanism/client/render/tileentity/RenderUniversalCable.java
 2013-09-28 03:06:41 +01:00
Aidan C. Brady
a73bf9e9d4 Necessary null check 2013-08-29 13:03:32 -04:00
Aidan C. Brady
86b8499bb5 A bit more organizing, nothing API related 2013-08-26 18:57:08 -04:00