4246 Commits

Author SHA1 Message Date
Florian Nücke
069af703a9 started implementing sgt's abstract bus interface 2014-01-03 14:43:10 +01:00
Florian Nücke
3a63b638ab Merge branch 'master' of https://github.com/MightyPirates/OpenComputers v1.1.0pre2a 2014-01-03 13:02:20 +01:00
Florian Nücke
28e0e0edec fixed project red bundled cable support requiring another bundled redstone mod to be present 2014-01-03 13:01:25 +01:00
Florian Nücke
7d30533918 Merge pull request #47 from Vexatos/patch-1
Some improvements to de_DE.lang
2014-01-02 14:10:03 -08:00
Florian Nücke
8e5bb6f1f4 showing information on disk in disk drive if analyzer is used on it, closes #49 2014-01-02 21:17:51 +01:00
Vexatos
e4755a57c5 Equalize line number for easier comparision 2014-01-02 14:02:20 +01:00
Vexatos
139faadb65 Some improvements to de_DE.lang
I think I/O should stay English
2014-01-02 13:56:41 +01:00
Florian Nücke
940e83995a actually implemented http request timeout... 2014-01-02 01:59:19 +01:00
Florian Nücke
8abc285f24 also cleaning up multi-block screens onChunkUnload (not just in invalidate()), may solve the screen issue mentioned in #45 2014-01-02 00:00:45 +01:00
Florian Nücke
f448b4e850 added support for project red bundled redwire, closes #2 v1.1.0pre2 2014-01-01 22:56:02 +01:00
Florian Nücke
d5978a935d fixed gt charger recipe to use charger boxes as intended 2014-01-01 22:21:22 +01:00
Florian Nücke
0c3213da4b updated comment in recipe files (still was old user recipes file name) 2014-01-01 19:32:20 +01:00
Florian Nücke
7e3b157aca fixed error in event.ignore that slipped in waaay back in 1fd375f, fixes #44 2014-01-01 17:58:45 +01:00
Florian Nücke
ad4359f2dd making term.read check for changes to the term's cursor position between events, to make it less problematic to display text via print or term.write when there's a read active (e.g. because we're in the shell or so but we want to print something from an event listener, such as a timer) 2014-01-01 17:50:46 +01:00
Florian Nücke
6b60dbdd06 fixed the fix *sigh* 2013-12-31 19:21:29 +01:00
Florian Nücke
d3538a55bc fixed edit writing an additional newline after the last line; fixed editor erroring when opening existing but empty files, fixes #39 and closes #43 2013-12-31 19:17:11 +01:00
Florian Nücke
77d3c1bd1e saving/loading http response queue. seems broken, no idea why (byte array gets saved to output stream, but when reading back it is shorter for some magical reason -.-) 2013-12-31 00:14:41 +01:00
Florian Nücke
7c8e1dc46d added setting to control timeout of http requests; pushing http request results directly as binary chunks now (of length misc.maxNetworkPacketSize), closes #21 and fixes #33 2013-12-30 20:23:11 +01:00
Florian Nücke
03e598dc08 added a readme 2013-12-29 18:43:07 +01:00
Florian Nücke
b6053b2581 refactored examples into "prefabs", skeleton implementations of some interfaces that can be extended and take care of some of the repetitive work 2013-12-29 18:22:42 +01:00
Florian Nücke
85961a7cba Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2013-12-29 16:29:40 +01:00
Florian Nücke
433e772ea5 statically linked library for windows, so people don't have to install the vc2012 runtime 2013-12-29 16:29:22 +01:00
Johannes Lohrer
15139af58a example block 2013-12-29 13:01:28 +01:00
Johannes Lohrer
107abb042f Example Component 2013-12-29 12:09:19 +01:00
Florian Nücke
2aba89c84e bumping version number v1.1.0pre1 2013-12-28 23:01:16 +01:00
Florian Nücke
14024a8bca fixed/reworked a couple of the gt recipes 2013-12-28 22:55:50 +01:00
Florian Nücke
954f357c44 Merge branch '1.1' of cil.li:oc into 1.1
Conflicts:
	li/cil/oc/Recipes.scala
2013-12-28 21:28:09 +01:00
Florian Nücke
aa682750d0 getRange callback for navigation upgrade to query area the upgrade works in; extended API for block drivers to allow querying for item stacks, used in adapter block to only allow adding filter for supported blocks 2013-12-28 21:23:31 +01:00
Johannes Lohrer
be245b6739 removed buildcraft recipes from default 2013-12-28 20:58:43 +01:00
Johannes Lohrer
55d34d1564 added assembly recipes 2013-12-28 20:50:12 +01:00
Johannes Lohrer
f79194c419 completed recipes 2013-12-28 19:31:40 +01:00
Florian Nücke
4d1f568db2 Merge branch '1.1' of cil.li:oc into 1.1 2013-12-28 18:55:55 +01:00
Johannes Lohrer
53ae80914c more gt recipes 2013-12-28 18:55:30 +01:00
Florian Nücke
fbb1fd748b mentioning expected recipe type in error messages (makes it easier figuring out issues when overwriting recipes that had a non-default = shaped type) 2013-12-28 17:55:27 +01:00
Johannes Lohrer
34f06cecfc Merge branch 'robot_components' of cil.li:oc into 1.1 2013-12-28 17:24:52 +01:00
Johannes Lohrer
ee7e1ece01 fixed oredict names 2013-12-28 17:24:00 +01:00
Florian Nücke
1c0a03ab65 allowing subID value 'any' as wildcard (instead of the actual number that is the wildcard) 2013-12-28 17:22:03 +01:00
Florian Nücke
d1cbe2c2b2 just some minor cleanup 2013-12-28 17:17:43 +01:00
Johannes Lohrer
5c5ddd1f72 Merge branch 'robot_components' of cil.li:oc into recipes 2013-12-28 17:03:04 +01:00
Johannes Lohrer
28bf54a64c changed ore dict entries for oc
added some gt recipes (WIP)
added Reflection assembly for GT
2013-12-28 17:02:44 +01:00
Florian Nücke
95b0b212dc Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.1 2013-12-28 16:56:58 +01:00
Florian Nücke
11a7c9242f added a bunch of validation and checks when restoring data from nbt, closes #30 v1.0.5a 2013-12-28 14:13:51 +01:00
Florian Nücke
13124a76be fixes ignorePower setting being ignored when turning on computers 2013-12-28 12:46:37 +01:00
Florian Nücke
da65e7fb31 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into 1.1 2013-12-28 04:33:35 +01:00
Florian Nücke
e96a167720 bumping version to 1.0.5 for release v1.0.5 2013-12-27 18:50:01 +01:00
Florian Nücke
ca52ec37a6 option for clients to select whether text on screens should be anti-aliased or not 2013-12-27 17:50:05 +01:00
Florian Nücke
55524c4a78 catching error when creating lua state due to missing libraries in factory and logging it right there, to allow printing error to chat the first time, too; different name the lib is saved to the tmp folder to reduce the chance of collisions; explicit message for windows users reminding them to install the vc2012 runtimes on library load errors 2013-12-27 00:18:22 +01:00
Florian Nücke
fb6f0a8866 moved scheduling of robot afterimage removal into added callback of afterimage block, to be on the safe(r) side 2013-12-26 17:48:43 +01:00
Florian Nücke
ccc2d6e276 also checking vanilla redstone wire in neighboring blocks even if doesn't connect directly (basically what BlockRedstoneLogic does) 2013-12-26 17:40:59 +01:00
Florian Nücke
934e579017 added safety check to not trigger a new move while moving. shouldn't really happen, due to the execution delay / pause being applied when moving, but to be on the safe side... 2013-12-26 17:01:05 +01:00