6328 Commits

Author SHA1 Message Date
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
payonel
ec0d879bfb new cursor lib, some vt100 fixes for windows
the cursor lib will probably become an official api, but not yet, still in beta
an application can define its own cursor, can handle the following methods
Here is a rough draft of the api, when it is official there will be an ocdoc article covering this
echo
  Echo does not change the input buffer, does not move the relative cursor position to the input, in is only used for updating the UI. Echo will receive the following
 "": scroll if needed
 nil: initialize blink if needed
 boolean: toggle blink if true, force blink off if false
 string: write string to output stream
 keyboard.keys.right and keyboard.keys.left: move the visual cursor left or right. scroll if necessary
move
  number: Intended to move the logical cursor relative to its current input. Should call echo for visual movement
update
  string: add (prepend, insert, or append) text to the input buffer
  number: remove (backspace, delete) text from the input buffer
  should call move if the cursor moves due to the text changes
handle
  (name, char, code): called in response to event signals when waiting for input. Typically this is used to handle key_down, touch, drag, and clipboard
  return nil if the cursor is closing
  return false if the input is interrupted
  return true if the input is not done
  return <string> as the result of the input when completed
2018-08-31 19:33:14 -07:00
payonel
ff8323c447 bit32 should always be require(), regardless of arch
too bad we weren't clearing it from _G on boot, else we would have seen this bug
i'm choosing to NOT clear in from _G on boot .. for now ..
2018-08-31 19:33:14 -07:00
payonel
541e765d7b need to close process after error handling 2018-08-31 19:33:14 -07:00
payonel
ab10c8738f log rc errors to /tmp/event.log
closes #2787
2018-08-31 19:33:14 -07:00
svitoos
2c2b9712ea 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 19:31:51 -07:00
payonel
943f3c2339 make cursor echo safe to call even without gpu ready 2018-08-31 18:09:28 -07:00
payonel
a85fe69692 using java 7 syntax to fix our IDEA builds 2018-08-30 12:45:11 -07:00
payonel
5a914d9cf9 Merge branch 'master-MC1.11' into master-MC1.12
# Conflicts:
#	build.gradle
2018-08-30 09:55:17 -07:00
payonel
a1cac639e3 Revert "idea build fix for scala with java 1.8"
This reverts commit 50da23baa7edb41ce6232dd8a107ebadc2606ef4.
2018-08-30 09:51:29 -07:00
payonel
61dc91350a skipping 1.11 cc support 2018-08-29 03:18:10 -07:00
payonel
e8ba939a33 Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
#	build.gradle
#	src/main/scala/li/cil/oc/integration/computercraft/ModComputerCraft.scala
2018-08-29 02:55:38 -07:00
payonel
7dc1622a0e update cc bundled cable support for 1.10 2018-08-29 02:36:59 -07:00
payonel
e2307316ee Merge branch 'master-MC1.7.10' into master-MC1.10 2018-08-29 02:06:52 -07:00
payonel
50da23baa7 idea build fix for scala with java 1.8 2018-08-29 00:42:55 -07:00
payonel
99d2e4a4a8 reduce gradle 2018-08-27 15:06:55 -07:00
payonel
91f0a0da3e maven publish fix 2018-08-27 14:47:25 -07:00
payonel
9c40a36099 reduce maven repos to oc only 2018-08-27 14:42:42 -07:00
payonel
7827f77680 maven publishing config fix 2018-08-27 13:26:31 -07:00
payonel
e5aa71dc52 reducing build.gradle 2018-08-27 10:23:17 -07:00
payonel
758dfed35e reduced gradle - all deps hosted on single maven 2018-08-25 08:22:49 -07:00