AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-27 23:14:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,325 Commits 29 Branches 143 Tags
Commit Graph

1325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
6adf8c3e02 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Delegator.scala
 2014-02-09 15:23:57 +01:00
Florian Nücke
77f0c0bcb4 fixed remote terminals' connection not being saved correctly 2014-02-09 15:21:01 +01:00
Florian Nücke
18d1f6de35 ignoring any invalid states when entering executor thread now, should avoid computers stopping due to race conditions and shouldn't have any negative side effects 2014-02-09 15:15:30 +01:00
Florian Nücke
b401f4c3b6 fixed npe and directly open server gui on client to avoid issues when quickly changing equipped item after trying to open it; changing up some code, might help with an issue reported in irc 2014-02-09 13:14:41 +01:00
Florian Nücke
6ffb6a0951 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
v2.0.0-pre1 		2014-02-09 01:08:23 +01:00
Florian Nücke
d5e31319fa localized 'address copied' message v1.2.0-pre3 2014-02-09 01:05:39 +01:00
Florian Nücke
ac0e63c40a adjustments for 1.7 2014-02-09 00:48:51 +01:00
Florian Nücke
f826a62cbe Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-09 00:44:52 +01:00
Florian Nücke
6aa75d1bc6 number of terminals that can be bound to a single server rack now increases with server tier (2, 4, 8 by default) 2014-02-09 00:43:10 +01:00
Florian Nücke
05fb8f01ba multiple tiers for servers, with different inventory sizes and costs 2014-02-09 00:11:00 +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
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
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
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
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
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
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
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
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
Florian Nücke
9910456dcc network changes 2014-02-07 14:19:54 +01:00
Florian Nücke
55861d349f nbt changes 2014-02-07 14:18:50 +01:00
Florian Nücke
28da97e629 item and block ids begone! 2014-02-07 14:17:05 +01:00
Florian Nücke
4fc03a6ca7 icon -> iicon, iconregster -> iiconregister 2014-02-07 14:13:05 +01:00
Florian Nücke
fb0b4e0d5d ForgeDirection, event and other renames / moves; transition to event system for some removed interfaces (crafting handler, e.g.) 2014-02-07 14:11:53 +01:00
Florian Nücke
9ad9f3571c all dem missing overrides; some minor cleanup 2014-02-07 13:44:38 +01:00
Florian Nücke
a685c22499 added check in block break callback of robots to avoid having them break themselves (e.g. with tools that break multiple blocks at once) 2014-02-06 16:19:06 +01:00
Florian Nücke
16e9aead60 removed block drivers for command block, note block and rim carriage controller, they have been moved to the OpenComponents addon 2014-02-06 15:10:27 +01:00
Florian Nücke
1a536d1df1 multiple servers now can no longer connect to the same side in a rack as discussed on irc, which makes it less likely for people to run into issues - they can still be connected directly by cables next to the rack, for example; remote terminal texture in inventory no longer blinks. when held in the player's hand it will be blank if unbound and blink if bound to a server 2014-02-06 13:13:14 +01:00