Florian Nücke
|
98cbaffca6
|
cc peripherals are now wrapped by default and can be disabled using a blacklist (in the config)
|
2014-02-08 22:29:39 +01:00 |
|
Florian Nücke
|
b12913b8b7
|
fixed internet card and abstract bus card in servers; made server implement context
|
2014-02-08 22:09:33 +01:00 |
|
Johannes Lohrer
|
704bb64ce1
|
added MassFab and Lamp
|
2014-02-08 19:48:36 +01:00 |
|
Florian Nücke
|
669d2c218f
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 19:45:05 +01:00 |
|
Florian Nücke
|
2bbe942d66
|
adjusted mcmod.info so it don't crash forge when published
|
2014-02-08 19:44:00 +01:00 |
|
Florian Nücke
|
8da6b4bd98
|
yet more refactoring!
|
2014-02-08 19:19:31 +01:00 |
|
Florian Nücke
|
f28257a049
|
me so indecisive
|
2014-02-08 19:18:19 +01:00 |
|
Florian Nücke
|
4dc5be944f
|
more refactoring
|
2014-02-08 19:14:16 +01:00 |
|
Florian Nücke
|
3e879f5473
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComponents
Conflicts:
src/main/java/li/cil/occ/OpenComponents.java
|
2014-02-08 19:03:25 +01:00 |
|
Johannes Lohrer
|
1dd3811260
|
Added AtomicScience
|
2014-02-08 19:02:24 +01:00 |
|
Florian Nücke
|
df509e9ba9
|
started refactor into own package
|
2014-02-08 19:01:50 +01:00 |
|
Johannes Lohrer
|
45469ab282
|
added all remaining mekanism TEs
|
2014-02-08 18:48:42 +01:00 |
|
Florian Nücke
|
c54980c99b
|
improved stability of component swap. there still seems to be very rare glitch when switching from one existing component to another (e.g. two screens connected -> remove primary one)
|
2014-02-08 18:42:06 +01:00 |
|
Florian Nücke
|
ccb5e54f44
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 16:38:00 +01:00 |
|
Florian Nücke
|
6659d0e215
|
registering generic peripheral driver last, to prefer more specialized implementations
|
2014-02-08 16:30:32 +01:00 |
|
Florian Nücke
|
933aae053a
|
preferring callbacks via annotation over those from peripherals to allow overrides
|
2014-02-08 16:29:30 +01:00 |
|
Florian Nücke
|
4e71de049a
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
|
2014-02-08 16:15:59 +01:00 |
|
Florian Nücke
|
cfff7e5917
|
carriage controller component is called 'carriage' again
|
2014-02-08 16:06:17 +01:00 |
|
Florian Nücke
|
5cb549741f
|
added interface to allow overriding name for compound drivers
|
2014-02-08 16:05:40 +01:00 |
|
Florian Nücke
|
23d8b988b8
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
src/main/scala/li/cil/oc/common/item/Terminal.scala
src/main/scala/li/cil/oc/common/tileentity/Rack.scala
|
2014-02-08 15:03:24 +01:00 |
|
Florian Nücke
|
597770dd1b
|
Context.address is now deprecated in favor of the new Context.node getter; emulating peripheral file system mounting; catching any errors in connect and disconnect callbacks
|
2014-02-08 14:52:34 +01:00 |
|
Florian Nücke
|
2bc84f49a5
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 13:52:59 +01:00 |
|
Florian Nücke
|
c2dc1f4e30
|
cleanup; reenabled drivers
|
2014-02-08 13:52:30 +01:00 |
|
Florian Nücke
|
110d15ff50
|
fixed match error; adding a tiny delay when switching primary components. this is mainly required for term.read, sh and lua to react to screens/gpu disappearing and reappearing
|
2014-02-08 13:51:34 +01:00 |
|
Johannes Lohrer
|
0105ee4156
|
added mekanism but not working for now! deactivated most drivers so don't use
|
2014-02-08 12:04:32 +01:00 |
|
Florian Nücke
|
d1d9a79bc9
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 03:27:10 +01:00 |
|
Florian Nücke
|
3097d7657b
|
fixed shell.running
|
2014-02-08 03:26:45 +01:00 |
|
Florian Nücke
|
97d2c8ad88
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 03:22:34 +01:00 |
|
Florian Nücke
|
dbdfcdba5d
|
fixed loading files into memory for file systems with a limited capacity backed by a folder in the save folder: if the real files were too big, an out of space exception was thrown, which in bad cases could even bubble and crash. we now allow exceeding the capacity of file systems, when loaded from disk; added try-catch around component load and save code, just in case
|
2014-02-08 03:20:41 +01:00 |
|
Florian Nücke
|
40e17dc493
|
fixed robot gui, too
|
2014-02-08 02:45:11 +01:00 |
|
Florian Nücke
|
e39bb6ab6b
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
|
2014-02-08 01:48:59 +01:00 |
|
Florian Nücke
|
5b67f9b693
|
patched up gui a little, slots now render correctly (mostly, tier numbers are a tad too dark)
|
2014-02-08 01:47:18 +01:00 |
|
Florian Nücke
|
ac0c8c8eee
|
added a generic wrapper for cc peripherals that can be enabled via config, should be used with caution since depending on what the peripheral's methods do this may crash or deadlock the game. the recommended approach would be to add explicit drivers for tested peripherals (that's just a matter of extending DriverPeripheral and overriding the getTileEntityClass method then).
|
2014-02-08 01:00:46 +01:00 |
|
Florian Nücke
|
e2f1172daf
|
added an interface to the api that allows custom declarations of methods (aside from the callback annotation), meant to make wrapping cc peripherals easier
|
2014-02-08 00:54:21 +01:00 |
|
Johannes Lohrer
|
a2b3eb98bc
|
Merge branch 'MC1.7' of cil.li:oc into MC1.7
|
2014-02-08 00:00:38 +01:00 |
|
Johannes Lohrer
|
092fea907d
|
fixed somewhat item rendering
|
2014-02-08 00:00:29 +01:00 |
|
Florian Nücke
|
d227c59c01
|
merged some of the event classes; fixed crash in keyboard event handler by moving it directly into the class
|
2014-02-07 23:09:50 +01:00 |
|
Johannes Lohrer
|
b39e550e15
|
forgot unregister
|
2014-02-07 22:31:26 +01:00 |
|
Johannes Lohrer
|
e63d1340b5
|
changed event registers to the correct type
|
2014-02-07 21:48:17 +01:00 |
|
Florian Nücke
|
4d99c28ee9
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
src/main/java/li/cil/oc/api/prefab/DriverBlock.java
Adjusted DriverTileEntity.java for 1.7
|
2014-02-07 17:09:28 +01:00 |
|
Florian Nücke
|
e80f68fbe6
|
cleanup; stripped down appen gridtileentity driver, accessing the whole network from any tile in the network is kinda lame - me controller provides this, too; sprinkled in some more finality
|
2014-02-07 17:07:16 +01:00 |
|
Florian Nücke
|
3ef27704d3
|
less code duplication
|
2014-02-07 15:58:05 +01:00 |
|
Florian Nücke
|
6d95fc5d69
|
y u no autoformat? (╯°□°）╯︵ ┻━┻
|
2014-02-07 15:27:40 +01:00 |
|
Florian Nücke
|
8a37621253
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComponents
|
2014-02-07 15:21:09 +01:00 |
|
Florian Nücke
|
a269418092
|
moved tile entity based block driver to api prefab package
|
2014-02-07 15:18:25 +01:00 |
|
Florian Nücke
|
11b34f6e8a
|
killed item based block driver and added tile entity type based prefab
|
2014-02-07 15:17:53 +01:00 |
|
Florian Nücke
|
bb3f66b970
|
autoversioning mcmod.info
|
2014-02-07 15:06:02 +01:00 |
|
Florian Nücke
|
ebe88a082e
|
Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
src/main/scala/li/cil/oc/server/fs/InputStreamFileSystem.scala
|
2014-02-07 14:49:48 +01:00 |
|
Florian Nücke
|
3badd67d4c
|
missed some
|
2014-02-07 14:47:47 +01:00 |
|
Florian Nücke
|
c3d4c11d86
|
moved stuff around to be where gradle needs it
|
2014-02-07 14:45:53 +01:00 |
|