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
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
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
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
e05479a909
Update every applicable API, remove some unused imports
2013-09-30 22:37:16 +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
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
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
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
Aidan C. Brady
13a47bbc96
Final changes in upgrade GUI modularization, will work on factory recipe type GUI modularization next
2013-08-26 18:28:55 -04:00
Aidan Brady
08fda4cdd5
Upgrade refactoring, CURRENTLY BROKEN
2013-08-25 20:54:34 -04:00
Aidan Brady
7f1b3d60f9
Tiny cleanup
2013-08-25 12:35:12 -04:00
Aidan Brady
b540e95381
Fix Gas Tank crash
2013-08-25 12:29:30 -04:00
Aidan Brady
13901f60b0
Bit of modularization
2013-08-25 12:17:56 -04:00
Aidan Brady
55fee96644
Updated IC2 API (again), added obsidian 200% ore-to-dust processing
2013-08-25 12:02:25 -04:00
Aidan Brady
9a6f4d6a0e
Fix the crashes people are having with checkTransmissionType()
2013-08-25 11:24:07 -04:00
micdoodle8
9b356038f9
Fix pressurized tubes not connecting to gas transmitters in external mods.
2013-08-25 01:39:55 -04:00
micdoodle8
8e667efd7b
Fix canTransferGas()
...
Tested and working.
2013-08-25 01:34:45 -04:00
Ben Spiers
0951acf142
Remove the old one. Forgot to save the file...
2013-08-25 02:47:16 +01:00
Ben Spiers
32c32fb106
Move checkTransmissionType to TransmissionType.
2013-08-25 02:41:03 +01:00
Ben Spiers
d18c9645f9
Fix being able to move the electric chest into a different slot using number keys and crashing everything
2013-08-25 02:41:03 +01:00
Ben Spiers
ecd9f29f07
Don't emit fluid from active pipes.
2013-08-25 02:41:03 +01:00
Aidan C. Brady
7a7b398f31
Several bugfixes, overhaul of TileEntity-based upgrade management
2013-08-24 21:22:45 -04:00
Ben Spiers
081e204dbf
Pressurized tubes transfer gas
2013-08-23 19:43:10 +01:00
Ben Spiers
8f4b19f87c
A slightly surprisingly large number of unused imports
2013-08-23 19:25:26 +01:00
Ben Spiers
6cf89af4b2
Generalise the EnergyMeter. The name may not be entirely accurate any more.
2013-08-23 19:23:08 +01:00
Ben Spiers
65776e3516
Fix a bit of wonkiness with pipes, etc.
2013-08-23 04:19:01 +01:00
Ben Spiers
486e5aa334
Make dynamic tanks render gaseous fluids by transparency instead of level.
2013-08-22 23:55:06 +01:00
