5459 Commits

Author SHA1 Message Date
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 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
payonel
49666dee0c safer install on low memory 2016-07-25 23:32:41 -07: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
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
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
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
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
Florian Nücke
d0524587c9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-18 20:09:03 +02:00
Florian Nücke
74e88ee33c Fixes #1972. 2016-07-18 20:08:46 +02:00
Florian Nücke
744d8f9f58 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-18 19:59:15 +02:00
Florian Nücke
4c80160f28 Merge branch 'move-programs' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-07-18 19:54:58 +02:00
payonel
ecbce30f09 improved terminal interruptions with smart shell support
Also:

Fixed a bug with command substitution not concatenating strings
Split /bin/ls for ultra simple formatting for low mem systems
Remove all instances of absolute paths to lib/tools and use package searching
2016-07-17 20:38:26 -07:00
Florian "Sangar" Nücke
e2a4b9d75f Merge pull request #1970 from Vexatos/jei-handler-fix
Fixed Callback Doc Handler for a very long last page.
2016-07-16 16:00:36 +02:00
Vexatos
08695e1233 Fixed Callback Doc Handler for a very long last page. 2016-07-16 15:22:17 +02:00
Florian Nücke
2c4c627ff5 Merge branch 'jei-handlers' of https://github.com/Vexatos/OpenComputers into master-MC1.8.9 2016-07-16 14:40:39 +02:00
Vexatos
b2e06800fd Partially added item highlighting for JEI. 2016-07-16 14:18:28 +02:00
Florian Nücke
82970cc92f Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-16 12:37:07 +02:00
Florian Nücke
450924d6f2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-07-16 12:36:01 +02:00
Vexatos
5c306ea32e Allow properly launching OC in a dev env again. (#1965) 2016-07-16 12:35:54 +02:00
Florian Nücke
0fa7acc4c3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-07-16 12:35:15 +02:00
Vexatos
6a066a8ba9 Added callback doc handler and moved manual usage handler to its own category. 2016-07-16 12:25:04 +02:00
Vexatos
7295b36c11 Fixed Navigation Upgrade recipe. (#1964)
Kewl.
2016-07-16 12:07:15 +02:00
payonel
e2331b67ff improvements to guid, devfs, cat, cp, and system error clarity
renaming guid to uuid and removing useless method toHex
adding text read and writer, compare to c++ stdlib stringstream. needed for advanced devfs
fix globbing with relative paths and . and .. in path
moving install confirmation before calling .install
fix cp: cp -r . /another/path (should copy contents of current dir)
fix cat when stdin is missing or closed
improved devfs supporting custom dir handlers for dynamic file listing

other non functional changes to clean up code and improved error messages
2016-07-16 01:08:31 -07:00
Vexatos
3423d93ae1 Moved Loot Disk Cycling handler into separate file. 2016-07-16 09:01:09 +02:00
Vexatos
34382d3d00 Added Manual usage handler for JEI. 2016-07-16 08:34:07 +02:00
Florian Nücke
a06dbdba3e Why did this still compile earlier .-. 2016-07-14 19:01:19 +02:00
Florian Nücke
b4389cc70d Closes #1958. 2016-07-13 19:48:32 +02:00
Florian Nücke
7d68bcdcb6 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-07-13 19:33:42 +02:00
Florian Nücke
7106021888 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
# Conflicts:
#	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
#	src/main/scala/li/cil/oc/server/component/DebugCard.scala
2016-07-13 19:33:26 +02:00
Florian Nücke
6837c7e02f Should fix duplicate UUID in TCP signals. 2016-07-13 19:33:09 +02:00
Florian Nücke
2e122599af Should fix #1941. 2016-07-13 18:53:36 +02:00
Florian Nücke
400d3981e1 Should fix missing updates in high precision mode, closes #1947. 2016-07-13 18:48:20 +02:00
Florian Nücke
a29c048a84 Merge branch 'proper-mc-dependency' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2016-07-13 18:30:48 +02:00
Florian Nücke
16e020adf0 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2016-07-13 18:30:22 +02:00
tuckertwo
de9ab0906d Fix Typoes in application.conf (#1423)
* Fix Typoes in application.conf
2016-07-13 18:30:40 +02:00
Vexatos
7387a0aba8 Added a hard Minecraft version dependency to avoid the coremod not loading on incorrect versions. 2016-07-13 18:30:04 +02:00