Florian Nücke
e23cff188f
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-17 11:37:04 +02:00
Florian Nücke
5c03d0517a
Gaah, right, that's
2016-04-17 11:35:55 +02:00
Florian Nücke
0ab516bd4a
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-16 14:59:11 +02:00
Florian Nücke
5ba972f559
Bah, allright then.
2016-04-16 14:57:46 +02:00
Florian Nücke
25b6d214a7
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-16 14:45:33 +02:00
Florian Nücke
b17c16064b
Merge branch 'buffer-chomp' of https://github.com/payonel/OpenComputers into master-MC1.7.10
2016-04-16 14:26:35 +02:00
Florian Nücke
5c602d42ad
Merge branch 'cp-keep-links' of https://github.com/payonel/OpenComputers into master-MC1.7.10
2016-04-16 14:26:21 +02:00
Florian Nücke
ae1cb3fe6e
Fixed error in network node remapping when node gets removed during that remapping operation.
...
E.g. file systems automatically connected together with the main component, as in the internet card.
This should fix a potential crash with OC conduits in EnderIO.
Also, unit tests \o/ You'll need ScalaTest and Mockito to run them.
2016-04-16 14:21:45 +02:00
payonel
9ffc060205
Chomp \r and \r\n from lines, not just \n
2016-04-15 23:20:34 -07:00
payonel
8baf006c89
cp -P added to support preserving symlinks. Also, -r enables -P
2016-04-15 20:10:50 -07:00
Florian Nücke
65664fa286
All the todos -.- Fixed IC2 power accepting and CC network message relay. Closes #1714 .
2016-04-15 00:29:13 +02:00
Florian Nücke
3b4b2f23a8
Fixed IC2 wrench integration.
2016-04-14 23:55:36 +02:00
Florian Nücke
c2f0077275
Grrr.
2016-04-14 23:51:41 +02:00
Florian Nücke
66b63fc8b1
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-14 23:43:12 +02:00
Florian Nücke
a686f2ac3f
Fixed MCU not initializing its components properly when re-loaded. Oopsies. Closes #1459 . Probably.
2016-04-14 23:42:51 +02:00
Florian Nücke
19eecd8ec0
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-14 22:43:41 +02:00
Florian Nücke
e45acd967b
Updated char width map for new font and made the width file resource-packable. Closes #1760 .
2016-04-14 22:40:37 +02:00
Florian Nücke
d24d70554b
Forward compat for BC, closes #1765 .
2016-04-14 20:53:13 +02:00
Florian Nücke
e7a236fba4
Updated and reenabled IC2 integration. Closes #1761 .
2016-04-09 15:10:40 +02:00
Florian Nücke
cfd12357bd
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-07 22:26:36 +02:00
payonel
f4de5c2549
bringing back shift tab to cycle tab completion list in reverse
2016-04-06 23:07:33 -07:00
payonel
b203bf6b44
try append mode to open wget output file first in case download fails
2016-04-06 21:26:16 -07:00
Florian Nücke
db72553a7a
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/integration/opencomputers/DriverMemory.scala
2016-04-06 20:32:54 +02:00
Florian Nücke
db332dbf38
Merge branch 'improved-lua-tab' of https://github.com/payonel/OpenComputers into master-MC1.7.10
2016-04-06 20:21:38 +02:00
Florian Nücke
61a6cc7fe5
Merge branch 'term-wrapping-fixes' of https://github.com/payonel/OpenComputers into master-MC1.7.10
2016-04-06 20:21:21 +02:00
Florian Nücke
ce940696cb
Fixed mountables not being in a network yet screwing with the racks reconnect logic, closes #1757 .
2016-04-06 20:20:00 +02:00
payonel
8adc7716f8
fix hint cache sometimes being lost during tab completion
...
The issue fixed is that the hint cache was being cleared far too often, including for key-up events. The fix is to only clear the cache on related events such as clipboard and key-down (but restore cache for tab keydown).
2016-04-05 21:53:45 -07:00
payonel
17ca9d5249
fix filter for term.read, dobreak via options, and onTouch for floating windows
2016-04-05 21:01:29 -07:00
payonel
a547319860
don't crash on number keys of tables in tab complete in lua prompt
2016-04-05 21:01:28 -07:00
payonel
a9233e5bfc
term wrapping and sh tab completion fixes
...
term wrapping fixes
Backspacing or deleting during vertical wrap would not update the current end of line correctly what the text was being pulled from the next line
horizontal wrapping deletion was not using dx,dy and instead was removing text from absolute positions on the screen
horizontal wrapping was pushing spaces beyond the windowed areas
2016-04-05 21:01:28 -07:00
Florian Nücke
9535cad412
Made max mem configurable.
2016-04-05 22:23:49 +02:00
Florian Nücke
a69c09e4be
Merge branch 'architecture-memory-fix' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10
2016-04-05 20:57:19 +02:00
payonel
0dd3421d4a
Continue tab complete on single hit results into result children
...
Tab complete in the lua prompt shows . on tables, but can give the wrong impression that there are no keys. Consider that the user types =filesyste[tab] and then sees =filesystem. and presses tab again. The hint table has only one entry, "=filesystem." and is cycling through that one entry and not reconsidering children of filesystem .. which is what the prompt makes the user think. This change injects a metamethod lookup in the 2nd index of a single result to repop the hint list with new children.
2016-04-04 22:05:21 -07:00
Florian Nücke
0082018de0
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-04 21:46:25 +02:00
gamax92
5a43bfd4cb
Update LuaJ, closes #1735 .
2016-04-04 21:45:16 +02:00
Florian Nücke
41a5f8cfbb
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-03 00:04:19 +02:00
payonel
b6326e87e8
delay load, term, and grep fixed
...
Delayload is lighter weight now. Improving method reuse and reducing boot costs about about 1.5k
term had some crashes and improper behavior. This fixed tab complete for 5.3 lua archs, term palette use, and missing tab complete hints. Term blinking now also supports setCursorBlink(false).
grep had a bug where patterns looking for start-of-line text would find in-line matches as well.
2016-04-02 13:07:03 -07:00
Florian Nücke
82edd9567d
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/server/command/SpawnComputerCommand.scala
2016-04-02 21:49:30 +02:00
Vexatos
eb8bd31b42
Improved rotation of computer spawning command.
2016-04-02 20:50:13 +02:00
Vexatos
8e54d5ef77
Made memory calculation a lot less hardcoded, finally allowing addons to define custom memory types.
2016-04-02 20:25:43 +02:00
Florian Nücke
eeec08e565
Fixed print multiparts not sending a change signal to other parts.
2016-04-02 16:40:51 +02:00
Florian Nücke
ed4451122b
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-04-02 16:29:33 +02:00
Florian Nücke
876279aefb
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
2016-04-02 16:28:56 +02:00
Florian Nücke
88f3412f0c
Backport switch achievement fix.
2016-04-02 16:28:43 +02:00
Florian Nücke
87290628e9
Redstone fixery and making lighted prints work in multiparts.
2016-04-02 16:20:07 +02:00
Florian Nücke
edcd8a1201
Fix potential NPE.
2016-04-02 16:17:05 +02:00
Florian Nücke
54eef9bb0c
Enforce complexity limit for multiparts.
2016-04-02 14:47:21 +02:00
Florian Nücke
94eff66b34
Added multipart support for prints.
...
Added delayed scheduling to EventHandler, used for button toggling in multiparts.
Also retry reverting when failing (possibly due to added other part in the meantime).
2016-04-02 14:41:24 +02:00
Florian "Sangar" Nücke
641800f79c
Merge pull request #1729 from new-sashok724/patch-1
...
Typo in WirelessNetworkCard.setStrength?
2016-04-01 09:42:17 +02:00
sashok724
fcf1c09b62
Typo in WirelessNetworkCard.setStrength?
2016-04-01 03:54:35 +00:00
