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
Aidan Brady
8509eaf0ad
Fixed IC2 integration :)
2013-08-30 15:20:52 -04:00
Calclavia
f373b06218
Updated ChickenBones mods in build.xml
...
Please also delete all broken builds!
2013-08-30 13:57:21 +08:00
Aidan Brady
92bee121b2
Update IC2 API
2013-08-29 18:57:13 -04:00
Aidan C. Brady
a73bf9e9d4
Necessary null check
2013-08-29 13:03:32 -04:00
Ben Spiers
9755b47833
Universal cable support for accepting from UE machines. change *Network* to *TransmitterNetwork* in ITransmitter to avoid method name conflicts.
...
Not all IConductor methods are properly implemented, doesn't seem to cause problems in my testing. Could probably implement IElectricityNetwork in EnergyNetwork but this seems to work.
2013-08-27 00:18:12 +01:00
Aidan C. Brady
86b8499bb5
A bit more organizing, nothing API related
2013-08-26 18:57:08 -04:00
Aidan C. Brady
6af0b1abd7
Screw it, package organization (sorry, that's an API update)
2013-08-26 18:49:32 -04:00
