payonel
5c9ac5c9f9
oops, missed ae fix
...
i forget ae fixes in merges from 1.10 because our ae support skips 1.11
2018-09-09 18:27:11 -07:00
payonel
b9a8a3c10d
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/client/renderer/HighlightRenderer.scala
2018-09-09 18:19:37 -07:00
payonel
11dd07d8ec
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/integration/appeng/NetworkControl.scala
2018-09-09 17:58:49 -07:00
SquidDev
3374cf45e8
Make cable block highlight hug the block
2018-09-09 17:11:27 -07:00
payonel
5712789c9b
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-09-09 16:35:36 -07:00
payonel
a75992e164
type safe check to remove erasure warning
2018-09-09 16:34:17 -07:00
payonel
436bd1808f
expose beep pattern api to lua
...
closes #2716
2018-09-09 14:34:45 -07:00
Vexatos
6db945299e
Properly add the version back into the config file.
...
Fixes #2833 .
2018-09-09 21:26:15 +02:00
payonel
7b77dba230
allow processes to handle hard interrupts
...
no general purpose api at this time
closes #2904
2018-09-08 11:39:37 -07:00
payonel
2fece0ab96
Merge branch 'master-MC1.11' into master-MC1.12
2018-09-08 00:21:24 -07:00
payonel
888d2501a2
Merge branch 'master-MC1.10' into master-MC1.11
2018-09-08 00:21:12 -07:00
payonel
de3675dd0f
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-09-08 00:20:54 -07:00
payonel
bf0fea1354
reduce event delay for term_available, delay rc
...
Load rc on "init" event
to keep rc load order consistent, move before boot fs event
registrations.
This change allows rc scripts and autoruns to consistently have term io
available
2018-09-08 00:17:53 -07:00
payonel
b65f536257
devfs psuedo files can be zero size
2018-09-05 17:20:19 -07:00
payonel
6591147c15
improved statement parsing, new reset alias
...
> args can expand to new params
add `reset`, clears screen and sets resolution to max
closes #2642
2018-09-05 15:45:11 -07:00
payonel
68914a63f8
alias more to less --noback
...
removing more in place of an alias to less
updating man docs to describe value of more over less in low mem cases
adding (END) to less status when the end of a buffer is reached
2018-09-04 16:48:25 -07:00
payonel
399ef4b1ba
/bin/less: optimize splits for super long lines
2018-09-04 13:27:10 -07:00
payonel
bb1c97edb4
rework more and less. simpler code, works with long lines payonel 09/04/2018 10:38 AM
2018-09-04 10:39:02 -07:00
payonel
4e5188da08
fix non tty cursor echo and support __call close
2018-09-04 08:44:25 -07:00
payonel
b9d4d425ea
Merge branch 'master-MC1.11' into master-MC1.12
2018-09-03 16:04:28 -07:00
payonel
4895e0f709
Merge branch 'master-MC1.10' into master-MC1.11
2018-09-03 16:04:14 -07:00
payonel
621d1e93e9
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-09-03 16:04:00 -07:00
payonel
afe858ff2d
tab complete aliases and improve io.dup efficiency
2018-09-03 16:00:54 -07:00
payonel
61a6ecfaa1
Merge branch 'master-MC1.11' into master-MC1.12
2018-09-02 12:50:24 -07:00
payonel
e370a7b264
Merge branch 'master-MC1.10' into master-MC1.11
2018-09-02 12:50:18 -07:00
payonel
428c347897
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-09-02 12:50:08 -07:00
payonel
b493512efd
woops, remove test code
2018-09-02 12:42:39 -07:00
payonel
8592cf2f25
cursor echos, io.dup, and remove unused redirect code
...
io.dup dups a handle, used now by all process creation and redirection
stop sharing cursors with spawned shell procs
write cursor echo to the stdin stream
close #2886
2018-09-02 12:41:38 -07:00
payonel
fcca0cc584
slight bin cleanup
2018-09-01 16:59:40 -07:00
payonel
b6bc9d0cea
fixed less, simplified
2018-09-01 16:49:31 -07:00
payonel
1fb05ff432
fix and simplify /bin/more
2018-09-01 15:27:00 -07:00
payonel
37d383ed2e
Revert "Migrate from MightyPirates to MovingBlocks JNLua [phase 1]"
...
This reverts commit b426a7f5638e4f3278b005a4de866b6050520e49.
2018-09-01 11:56:06 -07:00
payonel
58c0bb9d97
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# src/main/scala/li/cil/oc/common/Proxy.scala
2018-08-31 22:17:46 -07:00
payonel
a5eb9a0b7d
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/common/IMC.scala
2018-08-31 22:16:41 -07:00
payonel
65fa68e88e
Merge branch 'master-MC1.7.10' into master-MC1.10
...
# Conflicts:
# src/main/scala/li/cil/oc/common/IMC.scala
2018-08-31 22:14:54 -07:00
kmecpp
09e0561bac
Changed log level of some messages to reduce console spam
2018-08-31 21:45:54 -07:00
Adrian Siekierka
b426a7f563
Migrate from MightyPirates to MovingBlocks JNLua [phase 1]
2018-08-31 21:22:29 -07:00
utkumaden
8df1daf421
Fixed line 238
...
1 letter typo.
2018-08-31 21:05:11 -07:00
utkumaden
94f625f710
Added a Turkish Robot to the list
...
Please deny the PR if you only allow internationally famous robots.
2018-08-31 21:05:11 -07:00
utkumaden
379cdb3244
Added Turkish Localiziation for Items
...
Manual localization was not done.
2018-08-31 21:05:11 -07:00
payonel
c16c5bd6b8
Merge branch 'master-MC1.11' into master-MC1.12
2018-08-31 20:53:57 -07:00
payonel
6985352586
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# src/main/scala/li/cil/oc/integration/computercraft/BundledRedstoneProvider.scala
2018-08-31 20:47:30 -07:00
payonel
add0e45fc9
Merge branch 'master-MC1.7.10' into master-MC1.10
2018-08-31 20:21:32 -07:00
payonel
ef4bdd363b
cherry pick 366d94f08da608d3be30d70ce91e248fa6b4357e to 1.10
...
Support for the block property system in the geolyzer (closes #2746 , #2184 )
* works correctly with Beetroot
* supports chorus
* geolyzer.analyze() returns the properties table
* geolyzer.analyze() returns metadata again
* fix warning EventHandlerVanilla.scala: method getBlockHardness in class Block is deprecated
2018-08-31 20:14:09 -07:00
payonel
2483c1d7d8
update cc bundled cable support for 1.10
2018-08-31 19:33:14 -07:00
payonel
1a6756248c
openos pre-1.7.3 patching
...
1. as always, code cleanup and memory savings
2. allow force (-f) option with cp
3. cursor library, separating logic from tty [ the cursor library is robust and heavily tested, but the api is not finalized and is considered beta ]
4. fix autorun on ro fs
5. /bin/ls: run all filesystem calls in lua, safe from c-boundaries
6. vt100: small fix with clear line (1-off error)
2018-08-31 19:33:14 -07:00
SquidDev
5bdbadc125
Add bundled cable support for ComputerCraft
2018-08-31 19:33:14 -07:00
Adrian Siekierka
64035ff0c3
replace hardcoded hookInterval with bogomips calculator
2018-08-31 19:33:14 -07:00
Florian Nücke
be921a2d0f
Maven path now via environment variable.
2018-08-31 19:33:14 -07:00
payonel
95598f6262
should check timeout before blinking
2018-08-31 19:33:14 -07:00
