Vexatos
33e70a8f6c
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.gradle
# build.properties
2017-10-14 18:46:31 +02:00
Vexatos
845c607bfc
Merge branch 'master-MC1.9.4' into master-MC1.10
2017-10-14 18:45:35 +02:00
Vexatos
2e580f9e6c
Merge branch 'master-MC1.8.9' into master-MC1.9.4
2017-10-14 18:45:21 +02:00
Vexatos
d7bb35d6f0
Merge branch 'master-MC1.7.10' into master-MC1.8.9
2017-10-14 18:44:37 +02:00
Vexatos
fd5fd98c84
Subversion no more.
2017-10-14 18:43:25 +02:00
Vexatos
b2788b1932
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.properties
2017-10-14 18:36:16 +02:00
Vexatos
53bc6bb54a
Merge branch 'master-MC1.9.4' into master-MC1.10
2017-10-14 18:35:37 +02:00
Vexatos
8890422cbd
Merge branch 'master-MC1.8.9' into master-MC1.9.4
2017-10-14 18:35:14 +02:00
Vexatos
d0a20b6649
Merge branch 'master-MC1.7.10' into master-MC1.8.9
2017-10-14 18:34:47 +02:00
Vexatos
4fffcccd98
Version bump.
2017-10-14 18:34:12 +02:00
/Fox --develop
30e05b9c4f
Updated link to Lua code conventions
2017-10-04 14:52:43 -07:00
Vexatos
795762df85
Re-added IC2 integration.
...
Hopefully it works.
(cherry picked from commit 151ddecb2c305d6827c183d384690761272d5e16)
2017-10-04 20:12:16 +02:00
payonel
228d8c1a13
Merge branch master-MC1.9.4 into master-MC1.10
2017-10-03 12:33:15 -07:00
payonel
d7177d0233
Merge branch master-MC1.8.9 into master-MC1.9.4
2017-10-03 12:33:15 -07:00
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
