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

5044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
aed4d91840 Anti-null-pos-but-not-null-world-check? 2016-05-11 23:11:43 +02:00
Florian Nücke
ad9a446412 Update MC version for coremod. 2016-05-11 22:36:13 +02:00
Florian Nücke
238e75067a Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into master-MC1.9 2016-05-11 22:19:27 +02:00
Florian Nücke
8dbdd383e5 Fixed coloring recipe duping stuff. 2016-05-11 22:18:56 +02:00
Florian Nücke
c1b65f2100 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9 2016-05-11 22:18:40 +02:00
Florian "Sangar" Nücke
2949fdd276 Merge pull request #1787 from hsson/feature/additional-robot-name 
Adds three more names to the list
 2016-05-11 22:10:47 +02:00
Florian "Sangar" Nücke
d0f7fd7e3f Merge pull request #1786 from payonel/devfs-patch 
devfs should be rw
 2016-05-11 22:09:20 +02:00
Florian Nücke
200fd2d51e Fix IC2 NPE. Fixes #1771. 2016-05-11 21:50:45 +02:00
Florian Nücke
ef72d1a871 Made cable items be colored correctly. 2016-05-11 21:37:46 +02:00
Florian Nücke
f8fff3cba9 Made robots render properly again. 2016-05-11 21:30:31 +02:00
Florian Nücke
b6255435b7 Extract side-only interfaces from blocks and items. 2016-05-11 20:45:28 +02:00
Florian Nücke
45071082a1 Jenkins, y u so different :/ 2016-05-08 20:05:52 +02:00
Florian Nücke
0deee60d0e Bulk of the 1.9 port. 
A couple of issues remain:
- Robot rendering is borked as fudge.
- Colored cables don't really look colored in item form.
- Recoloring cables seems to dupe items.
Also, only barely tested the essentials (placed every block, spawned computer, 3d printed some stuff).
 2016-05-08 19:56:44 +02:00
Alexander Håkansson
26c4c0d33c Adds three more names to the list 2016-04-29 22:57:51 +02:00
payonel
2dd3efedc9 isReadOnly is in boot/, move return false to boot file 2016-04-28 16:43:57 -07:00
Florian Nücke
00bc7e2cee Added some missing methods to the devfs to avoid programs expecting them to be there breaking (such as df) and ordered them the same way as they are in the Scala filesystem component. 2016-04-27 23:47:46 +02:00
Florian Nücke
e9dac6e06c Merge branch 'unicode-mouse-clicks' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2016-04-27 23:30:38 +02:00
payonel
8d9c699ce0 fix onTouch for unicode support in shell (+backspace fix) 2016-04-26 21:34:10 -07:00
payonel
ad33ec285a big awesome update for devfs, command substitution, and io redirection 
Added another 60 tests, now totalling 901 all-passing tests. This change also reduces memory cost for boot by about 1300 bytes.

This change should be fully compatible with any 1.6 user scripts. This makes no change to api, only improves shell support and makes important process handle cleanup (when pipes and redirection is used - we are not auto-closing user file handles).
 2016-04-24 21:59:22 -07:00
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