Aidan Brady
|
ea21ad0061
|
Synchronization and better connection management
|
2013-10-18 20:17:40 -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
|
17d0e20bdb
|
Fix server crash
|
2013-10-16 13:49:31 -04:00 |
|
Aidan C. Brady
|
a5a4c7a65a
|
Prevent possible server crash
|
2013-10-15 19:57:18 -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
|
3dc2f49f76
|
Merge pull request #290 from Vexatos/patch-1
Walkie talkies?!?!?!?!?!?!?!?!?!?!?!?!?
|
2013-10-14 12:54:49 -07:00 |
|
Aidan C. Brady
|
15cba39b30
|
Fixed capes :)
|
2013-10-14 15:54:10 -04:00 |
|
Aidan C. Brady
|
15dc84bd5f
|
Stupid obfuscation
|
2013-10-14 15:07:30 -04:00 |
|
Aidan C. Brady
|
9d94e55ece
|
Hopefully fixed crash
|
2013-10-14 14:59:48 -04:00 |
|
Aidan C. Brady
|
3caf04ef4a
|
Fix IC2 error
|
2013-10-14 14:34:05 -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 |
|
Vexatos
|
5ac008ea53
|
Walkie talkies?!?!?!?!?!?!?!?!?!?!?!?!?
|
2013-10-14 19:31:20 +02: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
|
17fdc03e9f
|
Work on server
|
2013-10-13 23:40:28 -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 |
|
Aidan C. Brady
|
a6ed1c054e
|
Re-added maganese
|
2013-10-13 01:19:18 -04:00 |
|
Aidan C. Brady
|
9194f71630
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
Conflicts:
common/mekanism/common/Mekanism.java
|
2013-10-13 01:04:04 -04:00 |
|
Aidan C. Brady
|
b1c2afd68d
|
Add proper IC2 item support, add maganese for future use
|
2013-10-13 01:01:30 -04:00 |
|
Ben Spiers
|
308c333fc4
|
Merge pull request #287 from Vexatos/patch-2
Thank you.
|
2013-10-12 09:24:54 -07:00 |
|
Ben Spiers
|
1a6aa6cc01
|
Merge pull request #286 from Vexatos/patch-1
Fixed stuff
|
2013-10-12 09:21:52 -07:00 |
|
Vexatos
|
ade414f2b8
|
That was needed.
|
2013-10-12 18:19:54 +02:00 |
|
Vexatos
|
c9afe5192a
|
Fixed stuff
Electric bow entry doubled.
|
2013-10-12 18:19:43 +02:00 |
|
Ben Spiers
|
189c6d4551
|
L10n support by popular demand. Closes #204
|
2013-10-12 16:43:56 +01:00 |
|
Ben Spiers
|
3c73914337
|
Merge branch 'master' of github.com:aidancbrady/Mekanism
|
2013-10-12 15:39:01 +01:00 |
|
Aidan C. Brady
|
219384ef25
|
Hopefully fixed build
|
2013-10-10 11:46:08 -04:00 |
|
Aidan C. Brady
|
4c833346c8
|
Merge branch 'master' of https://github.com/aidancbrady/Mekanism
|
2013-10-08 18:06:34 -04:00 |
|
Aidan C. Brady
|
9735363dc1
|
Update IC2 API, minor enhancements and fixes
|
2013-10-08 18:06:25 -04:00 |
|
Aidan
|
58204bf52d
|
Merge pull request #265 from Bigcheese/master
Add simple developer documentation.
|
2013-10-08 15:05:47 -07: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
|
e05479a909
|
Update every applicable API, remove some unused imports
|
2013-09-30 22:37:16 +01:00 |
|
Ben Spiers
|
9c0b2a56b5
|
Update to 1.6.4. I hope this works.
|
2013-09-28 03:37:48 +01:00 |
|
Ben Spiers
|
7f4a603f64
|
Update ic2 API. AGAIN
Conflicts:
common/mekanism/common/Mekanism.java
common/mekanism/common/MekanismHooks.java
|
2013-09-28 03:20:43 +01:00 |
|
Ben Spiers
|
a4222a86f0
|
Update obf
Conflicts:
common/mekanism/client/render/tileentity/RenderUniversalCable.java
|
2013-09-28 03:06:41 +01:00 |
|
Ben Spiers
|
c53be88a5f
|
Fix a stupid bug.
|
2013-09-27 22:32:54 +01:00 |
|
Ben Spiers
|
53b659ca12
|
Merge pull request #264 from DarkGuardsman/master
could be a fix to concur modification error
|
2013-09-20 11:33:46 -07:00 |
|
Michael J. Spencer
|
b4e6d692ee
|
Add simple developer documentation.
|
2013-09-15 18:39:41 -07:00 |
|
micdoodle8
|
d70dbe431a
|
Fix concurrent modification exception when unloading chunks.
|
2013-09-12 17:28:32 -04:00 |
|
DarkGuardsman
|
b021cd6d3f
|
could be a fix to concur modification error
So far it looks like it is working but more research/testing needs to be
done.
|
2013-09-09 02:04:56 -04:00 |
|
Calclavia
|
2b068ef512
|
Non-dev ChickenCore derp
|
2013-09-08 20:49:14 +08:00 |
|
Calclavia
|
8d2a40c258
|
Fixed NEI build link
|
2013-09-08 20:45:02 +08:00 |
|
Calclavia
|
b3bc916a5e
|
Fixed Mekanism build crash
|
2013-09-08 20:42:53 +08:00 |
|
Calclavia
|
fe0b7cd757
|
Added universal cable to ore dict for recipe
|
2013-09-07 23:21:25 +08:00 |
|