Florian Nücke
db721940ff
Hmm.
2016-09-18 17:59:25 +02:00
Florian Nücke
3ca9998187
Should fix #2014 .
2016-09-18 17:59:13 +02:00
Florian Nücke
edf6b38283
Derp.
2016-08-06 14:15:15 +02:00
Florian Nücke
b9633afc47
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.10
2016-08-06 14:12:33 +02:00
Florian Nücke
ba59e7f535
Tesla support. Maybe.
...
(Couldn't test, IC2+JEI keep crashing on start for me...)
2016-08-06 14:12:17 +02:00
Florian "Sangar" Nücke
3a2ca5f878
Merge pull request #2004 from AffeAli/Fix-for-#2000
...
Fixed issue 2000
2016-08-06 10:53:45 +02:00
AffeAli
7ee884c34c
Fixed issue 2000
...
EntityLiving equals "sg" (not "sb") in 1.10.2 mapping.
2016-08-04 18:25:07 +02:00
Florian Nücke
4fe2a9026d
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2016-07-31 10:33:08 +02:00
Florian Nücke
87d3567abf
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-07-31 10:30:21 +02:00
Florian Nücke
b68d87855f
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-07-31 10:30:06 +02:00
payonel
2a5de6868a
some fixes learned from btm for term, grep, and devfs
...
using buffers for term stream string (used in devfs)
simulate enter key and split clipboards on multiline paste
delay proxy calls to eeprom until actually using /dev/eeprom
all reads on /dev/null (returns nil)
fix grep using ^
2016-07-30 22:33:28 -07:00
Florian Nücke
52ff039e31
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2016-07-30 17:25:27 +02:00
Florian Nücke
5b18f317e5
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-07-30 17:25:12 +02:00
Florian Nücke
4e257186bf
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/common/PacketBuilder.scala
2016-07-30 17:23:54 +02:00
Florian Nücke
f388340dd0
Make packet builder use buffering.
2016-07-30 17:19:20 +02:00
Florian Nücke
8585f0f197
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2016-07-30 09:41:27 +02:00
Florian Nücke
c5989952fc
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-07-30 09:41:16 +02:00
Florian Nücke
a0128f5c9c
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-07-30 09:40:54 +02:00
Florian Nücke
97b1313531
math.pow compat in Lua 5.3 ( #1992 ).
2016-07-30 09:38:00 +02:00
Florian Nücke
b503b947e4
Huh, still had this lying around. Can't remember what it was trying to fix, but it doesn't seem to make things more broken so eh.
2016-07-30 09:37:34 +02:00
Florian "Sangar" Nücke
5ed06deef7
Merge pull request #1989 from Spyboticsguy/master-MC1.10
...
Change scheduleIC2Add to use IEnergySink instead of IEnergyTile
2016-07-30 09:33:32 +02:00
Florian Nücke
fe2fe1b3d3
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2016-07-27 20:44:33 +02:00
Florian Nücke
f4249355a7
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-07-27 20:44:16 +02:00
Florian Nücke
9012d0ea3b
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-07-27 20:44:02 +02:00
Florian Nücke
954613081a
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2016-07-27 20:43:40 +02:00
Florian Nücke
aa103349d0
Try to prevent nodes loading into an illegal state.
2016-07-27 20:43:27 +02:00
Florian Nücke
2d1b329185
May or may not help with #1935 .
2016-07-27 20:37:19 +02:00
payonel
49666dee0c
safer install on low memory
2016-07-25 23:32:41 -07:00
Tristen Allen
1e23fdddd4
Change scheduleIC2Add to use IEnergySink instead of IEnergyTile
...
Fixes #1937 .
2016-07-25 15:48:54 -04:00
payonel
a4850a5ff1
allow soft interrupts to stop cp
2016-07-24 21:55:10 -07:00
payonel
aa422bf21a
fix /bin/touch
2016-07-24 21:37:40 -07:00
payonel
367f268662
reduce RAM costs by delaying part of /lib/buffer
2016-07-24 21:22:54 -07:00
Florian Nücke
8eee825272
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2016-07-24 20:13:52 +02:00
Florian Nücke
19fe850cae
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/WorldAware.scala
2016-07-24 20:11:39 +02:00
Florian Nücke
ca5fa481fe
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/WorldAware.scala
2016-07-24 20:10:40 +02:00
Florian Nücke
03947ebc02
Avoid event handlers throwing up making inv controller not work.
2016-07-24 20:06:23 +02:00
Florian Nücke
dac3aac519
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2016-07-24 18:23:50 +02:00
Florian Nücke
771107c3cb
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-07-24 18:22:09 +02:00
Florian Nücke
add5bba4a0
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-07-24 18:21:46 +02:00
Florian Nücke
05b7aa994c
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-07-24 18:21:23 +02:00
Florian Nücke
67d595196c
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-07-24 18:21:04 +02:00
payonel
f4c18cc266
small fixes for term, cp, df, mv, rm, and init
...
make term resize event handler safer by adding it to each window. this will have the same memory cost, but is more reliable
fix cp path check for copying dirs into themselves. there was a bug where /path/a_dir looked like a parent of /path/a_dir_2
cleanup df format by not adding padding on the far right side of the table
make init event handler slightly more efficient by waiting specifically for the init signal, rather than a specified amount of time
mv had some weird problems with missing files or empty quoted args - fix and added unit tests
rm force should have no prompt and always return success
2016-07-24 08:14:18 -07:00
payonel
b1f20243d8
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2016-07-22 22:48:01 -07:00
payonel
192c545d1c
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-07-22 22:43:54 -07:00
payonel
66d7337568
fix ^c for lua prompt
...
term.read() ^c now returns false broke lua prompt on ^c
any false return from a stream read should be indicative of a broken or ended stream to be more compliant with io.read behavior
2016-07-22 18:28:18 -07:00
payonel
05ded1a4bc
match real bash behavior and limit user defined io fds to 3-9
2016-07-21 20:51:01 -07:00
payonel
35d93e2a93
fix piping of redirected stdout
...
e.g.
Assume you have a script that print to stdout as well as stderr:
[test.lua]
print("foo")
io.stderr:write("bar")
Then run this script, redirecting [2] to stdout, and [1] to dev null, then piping to grep
./test.lua 2>&1 >/dev/null | grep baz
This test should print NOTHING to the terminal, "foo" went to dev null, "bar" when to stdout, and grep matched on "baz", thus should not print. But the bug I found was that [2] was redirected to terminal tty stdout and then AFTER that the piping code added a pipe on [1], but [2] was already pointing to tty. The fix is to move the piping before redirections are created, so that when [2] redirects to stdout, stdout is already the pipe.
2016-07-21 09:38:16 -07:00
Florian Nücke
490123e283
Updated Forge.
2016-07-20 19:20:43 +02:00
payonel
5be3dc5ad2
Merge pull request #1984 from payonel/soft-term-available
...
act like closed pipe when terminal becomes unavailable
2016-07-19 01:22:38 -07:00
payonel
5f8fd43586
oops, i shouldn't assert if the terminal becomes unavailable
2016-07-19 00:56:52 -07:00
