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
2c907cde74
Merge remote-tracking branch 'upstream/master-MC1.11' into master-MC1.12
2017-09-10 01:12:36 -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
Vexatos
a98019bac9
Fixed SimpleComponent injection not working.
2017-09-01 16:15:42 +02: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
c6e43d3031
Merge pull request #2496 from asiekierka/master-MC1.12
...
fix ClassTransformer crash
2017-08-18 17:27:57 +02:00
Adrian Siekierka
e4899cee2f
fix ClassTransformer crash
2017-08-18 17:22:14 +02:00
Vexatos
ccf2d96646
Merge branch 'master-MC1.11' into master-MC1.12
2017-08-15 13:07:29 +02: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
Vexatos
69a2a1df41
Fixed leash method patching in coremod.
...
See #2490 .
2017-08-13 10:22:05 +02:00
Vexatos
a537e72340
Merge pull request #2490 from asiekierka/master-MC1.12
...
update to Minecraft 1.12.1, various fixes
2017-08-12 13:45:06 +02:00
Adrian Siekierka
431e3b5c42
update to Minecraft 1.12.1, various fixes
2017-08-12 12:53:55 +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
payonel
f00c2dd6a2
simplify tty check slightly and add comment that tty should not be used directly by user code
...
maybe i should just move tty to /lib/core
2017-08-08 18:45:36 -07:00
Leon
cad14acf0d
Added AE2 Integration
...
Now fully using the AE2-Api
2017-07-25 15:25:20 +02:00
Florian Nücke
01ada77717
Merge branch 'master-MC1.11' of github.com:MightyPirates/OpenComputers into master-MC1.12
2017-07-23 20:24:29 +02:00
Florian Nücke
9486454036
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
2017-07-23 20:24:19 +02:00
Florian Nücke
21d5b21e7f
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-07-23 20:23:42 +02:00
Florian Nücke
d974b52dbf
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-07-23 20:23:21 +02:00
Florian Nücke
1d72eebc12
Update TIS-3D dependency.
2017-07-23 15:01:02 +02:00
Florian Nücke
01f69b93e1
Merge branch 'master-MC1.12' of https://github.com/modmuss50/OpenComputers into master-MC1.12
2017-07-23 14:08:45 +02:00
Vexatos
927b1d7a26
Fix colorize recipe.
2017-07-23 13:37:30 +02:00
Florian Nücke
67895541c6
Fix adapter bottom texture.
2017-07-22 18:15:16 +02:00
Florian Nücke
70f8eeb275
1.12 adjustments.
2017-07-22 15:57:03 +02:00
Florian Nücke
958c677320
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/server/component/traits/WorldInventoryAnalytics.scala
2017-07-22 15:54:04 +02:00
Florian Nücke
beb4a57bcc
Merge branch 'master-MC1.10' of github.com:MightyPirates/OpenComputers into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/ru_RU.lang
2017-07-22 15:53:15 +02:00
Florian Nücke
f989cff704
Merge branch 'master-MC1.9.4' of github.com:MightyPirates/OpenComputers into master-MC1.10
2017-07-22 15:49:21 +02:00
Florian Nücke
9f9041c580
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9.4
2017-07-22 15:49:12 +02:00
