AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 03:36:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,816 Commits 29 Branches 143 Tags
Commit Graph

5816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
be125a606c Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-07-18 20:31:40 +02:00
Florian Nücke
d219db283f No NEI. 2016-07-18 20:31:29 +02:00
Vexatos
cfe67bdf48 Fixed bad merge by @fnuecke. 
Does not fix @fnuecke being bad at merging.
 2016-07-18 20:28:16 +02:00
Florian Nücke
6445bfb7a7 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-07-18 20:10:30 +02:00
Florian Nücke
792331ba77 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-18 20:09:15 +02: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
f7725b9a7c Merge branch 'jei-highlights' of https://github.com/Vexatos/OpenComputers into master-MC1.10 
# Conflicts:
#	build.properties
#	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
#	src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala
 2016-07-18 20:03:01 +02:00
Florian Nücke
065bfdca0c Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 
# Conflicts:
#	build.gradle
#	build.properties
 2016-07-18 20:00:59 +02:00
Florian Nücke
4b92ba7f58 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-18 19:59:35 +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
Florian Nücke
42f47fa228 Also removed excludes of readded integration to fix build. 
That, and merging be hard.
 2016-07-18 19:31:31 +02:00
Florian Nücke
809d2a433f Merge branch 'jei-relay-gui-handler' of https://github.com/Vexatos/OpenComputers into master-MC1.9.4 
# Conflicts:
#	src/main/scala/li/cil/oc/integration/jei/ModPluginOpenComputers.scala
 2016-07-18 19:23:07 +02:00
Florian Nücke
6725463156 Merge branch 'igw-support' of https://github.com/Vexatos/OpenComputers into master-MC1.9.4 
# Conflicts:
#	build.gradle
 2016-07-18 19:20:37 +02:00
Florian Nücke
437ea9f5f0 Merge branch 'tis3d-support' of https://github.com/Vexatos/OpenComputers into master-MC1.9.4 
# Conflicts:
#	build.gradle
 2016-07-18 19:19:03 +02:00
Florian Nücke
db9d9d083a Merge branch 'jei-subtypes' of https://github.com/Vexatos/OpenComputers into master-MC1.9.4 2016-07-18 19:17:43 +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
Vexatos
c94e053348 Fully added JEI item highlighting. 2016-07-17 19:56:24 +02:00
Vexatos
82afba1287 Added a JEI GUI handler for the Relay. 2016-07-17 19:54:17 +02:00
Vexatos
6a1acdf0be Re-added support for IGW-Mod. 2016-07-17 16:46:14 +02:00
Vexatos
fcbdb58a92 Re-added support for TIS-3D. 2016-07-17 16:35:18 +02:00
Vexatos
c165f34ebd Added subtype recognition for JEI. 2016-07-17 16:21:01 +02:00
Vexatos
9595d18da5 Copied improvements to Callback Doc Handler from the JEI handler. 2016-07-17 15:55:49 +02:00
Vexatos
2e2a3ca3ab Disable NEI Highlights when NEI is hidden. 2016-07-17 15:49:54 +02:00
Vexatos
cb269e3e0c Re-added NEI support. 2016-07-17 14:54:36 +02:00
Florian Nücke
2459e99615 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-07-16 16:01:06 +02:00
Florian Nücke
7bcb662407 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-16 16:00:47 +02: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
Florian Nücke
5cdf303ce6 Update JEI dep. 2016-07-16 15:22:24 +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
8c29e170aa Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-07-16 15:17:49 +02:00
Florian Nücke
a1584036ef Port JEI integration. 2016-07-16 15:17:31 +02:00
Florian Nücke
91754f30c2 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 2016-07-16 14:49:31 +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
326981b385 Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10 2016-07-16 12:40:27 +02:00
Florian Nücke
15961b7877 Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4 
# Conflicts:
#	build.gradle
#	src/main/scala/li/cil/oc/integration/util/DamageSourceWithRandomCause.scala
 2016-07-16 12:38:38 +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