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

1139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YuRaNnNzZZ
e325d20e98 Create ru_RU.lang 
Added Russian localization.
 2014-02-11 03:26:50 -08:00
Florian Nücke
81e900bfef added new Keyboard implementation so that keyboard only works on proper sides again, still keeping the old one around for upgrading. 2014-02-10 23:40:42 +01:00
Florian Nücke
9c3e6fca80 adjustments for 1.7 2014-02-10 22:45:52 +01:00
Florian Nücke
ac034907fe Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/tileentity/Cable.scala
	src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala
	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
 2014-02-10 22:38:49 +01:00
Florian Nücke
f48d3d304e using tick handler instead of scheduled tick updates to register non-ticking tile entities in the component network 2014-02-10 22:36:08 +01:00
Florian Nücke
bcde36e74c renamed localization keys to be more standard conform 2014-02-10 22:12:14 +01:00
Florian Nücke
a401858a80 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
 2014-02-10 18:24:40 +01:00
Florian Nücke
38c231ed71 fixed some bugs; added readme in api package; marked cc filesystem factory methods optional 2014-02-10 18:16:16 +01:00
Florian Nücke
294425ab06 increased default timeout for scripts to avoid timeouts when the system is under load (the threads are very low priority, right now they occasionally starve); increased default render distance for screens a bit; made ManagedPeripheral not extend anything anymore to make it more versatile (in particular, to make it usable with SimpleComponent) 2014-02-10 13:28:55 +01:00
Florian Nücke
49a8c331bf added optional annotation to methods in example code in simplecomponent 2014-02-10 04:02:36 +01:00
Florian Nücke
2f3f52adc1 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Also updated srg names where used.

Conflicts:
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
 2014-02-10 03:45:15 +01:00
Florian Nücke
8aff007171 added an interface that can be used to mark tile entities as components. a class transformer is used to then inject any component related functionality into the marked tile entities, and the tile entities just have to mark methods with the Callback annotation. 2014-02-10 03:07:10 +01:00
Florian Nücke
7ae42dbb48 made ManagedPeripheral extend Environment directly, to allow implementing said interface in TileEntities directly 2014-02-09 17:16:17 +01:00
Florian Nücke
5756b52cd0 fixed not showing 'out of range' error when bound server isn't loaded, e.g. because too far away from the chunk or in another dimension 2014-02-09 16:26:34 +01:00
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