5892 Commits

Author SHA1 Message Date
payonel
eb9d8536f9 Merge branch master-MC1.7.10 into master-MC1.8.9 2017-10-03 12:33:15 -07:00
payonel
da4bd5116a Merge branch master-MC1.10 into master-MC1.11 2017-10-03 12:33:15 -07:00
payonel
f1b953c7aa introduce screens to gpus in robot components
GPUs have neighbor visibility, and screens have network visibility. But in a robot the gpu and screen are sibling components, with edges to the machine, but without edges to each other. Thus during load they are not connected to each other (regardless of load order). Robots already have a provision for this issue for connecting screens to keyboards and keyboards to screens, but lacked a custom screen->gpu connection. This code change simply adds that search and connects all screens to all gpus.

closes #2302
2017-10-03 12:31:38 -07:00
Vexatos
d09a4a3ff4 Fix yet another silly error related to null ItemStacks. 2017-10-03 19:05:30 +02:00
Vexatos
ef64fbb3fb Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
# Conflicts:
#	src/main/scala/li/cil/oc/server/agent/Player.scala
2017-09-29 20:45:00 +02:00
Vexatos
e485d9ea32 Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.10 2017-09-29 20:30:01 +02:00
Vexatos
3c24a69d96 Fixed exception thrown when other code tries setting the equipment slot stack. 2017-09-29 20:29:14 +02:00
Vexatos
c6c07fe524 Backport of the fix for equipment slot actions.
See commit 8066412830c5b7aeeb3bd46673ca37f2945e0d7b
and f3490663efb7e7e376d225f083176cbdfb414590.
2017-09-29 18:11:26 +02:00
payonel
c5bb6221cb Merge branch master-MC1.8.9 into master-MC1.9.4 2017-09-28 11:23:28 -07:00
payonel
be05dc5bec Merge branch master-MC1.7.10 into master-MC1.8.9 2017-09-28 11:23:28 -07:00
payonel
4d762aec25 Merge branch master-MC1.10 into master-MC1.11 2017-09-28 11:23:28 -07:00
payonel
7bb58a635c Merge branch master-MC1.9.4 into master-MC1.10 2017-09-28 11:23:28 -07:00
Vexatos
03c2c4b762 Fixed table returned by getAllStacks().getAll() being 0-based. 2017-09-28 19:07:09 +02:00
payonel
066fc4b784 protect dispatch from callbacks that unregister handlers
closes #2528
2017-09-21 13:49:16 +02:00
payonel
3390b655ec Merge branch 'master-MC1.10' into master-MC1.11 2017-09-17 11:49:07 +02:00
payonel
71e53f8322 Merge branch 'master-MC1.9.4' into master-MC1.10 2017-09-17 11:48:39 +02:00
payonel
55f8381e67 Merge branch 'master-MC1.8.9' into master-MC1.9.4 2017-09-17 11:48:14 +02:00
payonel
e7073e4fd5 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-09-17 11:47:27 +02:00
payonel
2abd8b3134 closes #2507
/bin/less and /bin/more were able to lock up the system if they call string.gsub(string, function) on a very large string (~144k chars long).
The machine layer intercepts expensive strings calls by checking the length of the string, but it does not intercept gsub calls when the replace action is a function

The fix is to intercept all long string actions, not just non-function replacement gsub calls

Note that /bin/more is now more efficient and doesn't call string.gsub, but this is still the right fix to keep the sandbox from being able to lock up the system with string methods
2017-09-17 11:30:19 +02:00
payonel
47c67a119f term fixes, scroll methods was moved 2017-09-16 08:19:49 +02:00
payonel
5c9760cf77 thread code cleanup for clarity, no api change 2017-09-13 10:46:17 -07:00
payonel
6190d75c37 more cats
improve cat io by directly feeding stream data to output and optimize more to not use line parsing
2017-09-12 15:26:25 -07:00
payonel
335393be03 Merge remote-tracking branch 'upstream/master-MC1.10' into master-MC1.11 2017-09-11 08:58:23 -07:00
payonel
1ace76bead Merge remote-tracking branch 'upstream/master-MC1.9.4' into master-MC1.10 2017-09-11 08:58:07 -07:00
payonel
5b812239a1 Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4 2017-09-11 08:57:51 -07:00
payonel
35e51459b4 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-09-11 08:57:29 -07:00
payonel
0b767e6c7c fix cat when input is tty 2017-09-11 08:09:08 -07:00
payonel
9d544b3731 tty and term fixes and correctness
* term.pull fix, the tty stream no longer needs a cursor object
* buffer reads now pass the original result and reason all the way back. this allows /bin/sh to distinguish ^c from ^d
* /bin/sh cleanup to not show prompt when there is no input tty
2017-09-10 23:33:13 -07:00
payonel
ffc04289f6 Merge remote-tracking branch 'upstream/master-MC1.10' into master-MC1.11 2017-09-10 01:10:38 -07:00
payonel
c5b112b4a5 Merge remote-tracking branch 'upstream/master-MC1.9.4' into master-MC1.10 2017-09-10 01:03:49 -07:00
payonel
e810b556e1 Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4 2017-09-10 01:03:23 -07:00
payonel
fc314fb3c9 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-09-10 01:02:57 -07:00
payonel
d8033669eb optimizations and fixes
* /bin/cat chunk based [huge performance and memory savings, can handle enormous files now]
* /bin/sleep blinks now
* removed unnecessary methods from tty
* cursor blinking and scrolling terminal improvements
* fixed bad term call to tty write
2017-09-10 00:58:54 -07:00
Florian Nücke
a9251de67d Merge branch '28Smiles-master-MC1.10' into master-MC1.10 2017-09-09 20:14:14 +02:00
Florian Nücke
4f939ac99f Merge branch 'master-MC1.10' of https://github.com/28Smiles/OpenComputers into 28Smiles-master-MC1.10 2017-09-09 20:10:03 +02:00
payonel
8af5c0d056 further serialization cleanup 2017-09-08 20:01:25 -07:00
payonel
1bc6e84af2 use a growing vector of string parts to serialize a string, returning table.concat when done 2017-09-08 20:01:25 -07:00
payonel
eaf2b0cf8a ignore the robot magic filesystem with install, and small /bin/sleep fix
/bin/sleep ^c was printing an error because it was returning the event data, which prompts was interpretting as error details [unexpected]
use a .prop file to have the robot component magic fs be ignored when running `install`
2017-09-08 00:49:50 -07:00
payonel
81ffb2187b Merged contribution from BillyJimson
https://github.com/MightyPirates/OpenComputers/pull/2324
2017-09-07 18:13:15 -07:00
payonel
ae501a859d return true from thread method as per documented specification 2017-09-07 10:34:47 -07:00
payonel
fc486d4bd2 openos 1.6.8 update
Changes

* thread: fix coma state issue where thread would not resume
* thread: add thread.current(), returns current thread [ the init thread is still technically not a thread ]
* tty: simplify the api with read, and separate all stream methods from the library
* sleep: /bin/sleep will now show blinking cursor and can be interrupted
* echo: use io.write instead of print. print loads slightly more resources
2017-09-07 08:40:30 -07:00
payonel
a1512451fe support s and u vt100 codes
strangely, the real terminal appears to treat [su] the exact same as [78] even though the specification says [su] is position only
2017-08-23 12:24:05 -07:00
payonel
c4c3811376 revert removal of process.running -- some scripts still use it 2017-08-22 11:22:06 -07:00
Vexatos
e43bb76d6b Merge remote-tracking branch 'origin/master-MC1.11' into master-MC1.11 2017-08-15 13:04:45 +02:00
Vexatos
f3490663ef Added some madness to simulate block placing as an offhand action to make equipment slot actions work properly again. 2017-08-15 13:04:35 +02:00
payonel
e39cf55c6d Merge remote-tracking branch 'upstream/master-MC1.10' into master-MC1.11 2017-08-08 18:48:22 -07:00
payonel
064d9bd55a Merge remote-tracking branch 'upstream/master-MC1.9.4' into master-MC1.10 2017-08-08 18:48:04 -07:00
payonel
a4b470e166 Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4 2017-08-08 18:47:44 -07:00
payonel
cc4cc2d5e9 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-08-08 18:47:00 -07:00
payonel
2a178f6d41 fix quiet /bin/source
quiet mode in /bin/source was a mess -- making .shrc scripts not able to print. Also, a lot of the /bin/sh arg parsing code has traditionally been over complicated. cleaned that up as well thanks to old code that expected strings in the args having been removed some time ago
2017-08-08 18:45:36 -07:00