payonel
7b1867a888
tablet card support fixed
2017-12-09 21:55:54 -08:00
payonel
ef97a06305
Merge branch master-MC1.10 into master-MC1.11
...
#removed src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala from merge
#673facee9077454b8401b1bb018f626e02bf3802
2017-12-06 07:48:07 -08:00
payonel
f074f17e2a
Merge branch master-MC1.10 into master-MC1.11
2017-12-02 23:47:48 -08:00
payonel
2279b734a8
Merge branch master-MC1.7.10 into master-MC1.10
2017-12-02 23:47:37 -08:00
payonel
3ddd58374c
toString device info
2017-12-02 23:47:32 -08:00
payonel
1cb8d4f0cc
Merge branch master-MC1.10 into master-MC1.11
2017-12-02 23:14:10 -08:00
payonel
e18123049b
Merge branch master-MC1.7.10 into master-MC1.10
2017-12-02 23:13:22 -08:00
payonel
cad5026a5f
adding max packet parts to device info width for linked cards and network cards
...
closes #2294
2017-12-02 23:12:34 -08:00
payonel
c484de0b2f
Merge branch master-MC1.10 into master-MC1.11
2017-12-02 20:51:19 -08:00
payonel
dbb3a2d9ed
Merge branch master-MC1.7.10 into master-MC1.10
2017-12-02 20:50:55 -08:00
payonel
34820ad487
use custom slot for databases
...
closes #2546
2017-12-02 20:50:24 -08:00
Skye
62e38f40df
Readd the printing of a CTCP if it wasn't handled.
...
No I haven't tested this, what are you talking about?
2017-11-30 23:17:53 -08:00
LeshaInc
7f71953540
tree: fix tlwy error
2017-11-30 10:16:02 -08:00
payonel
ef2a7488ca
Merge branch master-MC1.10 into master-MC1.11
2017-11-28 22:47:46 -08:00
payonel
893f76c8ff
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-28 22:47:34 -08:00
payonel
6cad5bb726
protect lua shell from serialization oom failure
2017-11-28 22:44:42 -08:00
payonel
4f7d836536
Merge branch master-MC1.10 into master-MC1.11
2017-11-27 13:56:43 -08:00
payonel
4a9b24c9b7
merge oops
2017-11-27 13:56:36 -08:00
payonel
3cdabb1036
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/lang/de_DE.lang
# src/main/resources/assets/opencomputers/lang/zh_TW.lang
2017-11-27 13:22:37 -08:00
payonel
747213ba6c
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-27 12:25:58 -08:00
payonel
e6efd30ecc
i derped, event.handlers and things
2017-11-27 12:25:44 -08:00
payonel
89b2ff19cb
WOOPS fix keyboard.keys reverse (index->key) lookup
...
sorry, this has been broken for a while
2017-11-27 12:25:44 -08:00
payonel
4730f44bf7
make uC a sided inventory and deny item extract and insert
...
fixes interaction with enderio item conduits
closes #2641
2017-11-27 12:25:44 -08:00
Nexarius
9cb94d391d
Update de_DE.lang ( #2091 )
...
* Update de_DE.lang
* Update de_DE.lang
* Update de_DE.lang
* Update de_DE.lang
2017-11-27 12:25:44 -08:00
Caitlyn
4cc635e182
Make actions work in the IRC client again.. ( #2544 )
...
disables printing CTCPs for now.. as this makes actions appear twice.
better fix?
2017-11-27 12:25:44 -08:00
mymagadsl
0f92e372fd
Update zh_TW.lang ( #1493 )
2017-11-27 12:25:44 -08:00
payonel
71241483fc
i derped, event.handlers and things
2017-11-27 12:11:16 -08:00
payonel
43a4db05ec
WOOPS fix keyboard.keys reverse (index->key) lookup
...
sorry, this has been broken for a while
2017-11-25 00:07:59 -08:00
payonel
2a3343391d
make uC a sided inventory and deny item extract and insert
...
fixes interaction with enderio item conduits
closes #2641
2017-11-24 23:45:53 -08:00
Nexarius
27533bbc83
Update de_DE.lang ( #2091 )
...
* Update de_DE.lang
* Update de_DE.lang
* Update de_DE.lang
* Update de_DE.lang
2017-11-24 13:33:29 +01:00
Caitlyn
f17b37b444
Make actions work in the IRC client again.. ( #2544 )
...
disables printing CTCPs for now.. as this makes actions appear twice.
better fix?
2017-11-24 00:17:56 -08:00
mymagadsl
948021ec84
Update zh_TW.lang ( #1493 )
2017-11-24 00:11:13 -08:00
payonel
30906fe9a9
Merge branch 'master-MC1.10' into master-MC1.11
2017-11-23 23:17:43 -08:00
payonel
18c03ab2b5
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.10
2017-11-23 23:17:15 -08:00
payonel
28e312d0f1
adding dangranos as a contributor in the ru_RU author list
2017-11-23 23:16:56 -08:00
payonel
8a9f8ca205
russion translation contribution thanks to makkarpov
2017-11-23 23:14:10 -08:00
payonel
5d470f892a
Merge branch master-MC1.10 into master-MC1.11
2017-11-23 22:47:47 -08:00
payonel
60d9db7195
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-23 22:47:46 -08:00
payonel
81722cc7cd
change FIleSystem.checkHandle() to also check for a table parameter
...
thanks to @Pwootage, who explained this change as such:
Previously, checkHandle was not "language safe" (or at least, not JSON-safe):
open() returns a HandleValue (which is a type not exposed by the oc-api jar)
checkHandle() checks for either a integer, or a HandleValue object
When calling through a custom architecture, HandleValue may or may not be preserved, as the underlying language, unless it can attach the original Java object, may not be able to represent the HandleValue class, and so convert it to a table, which checkHandle() did not check for.
2017-11-23 22:47:08 -08:00
payonel
689a4964a6
Merge branch master-MC1.10 into master-MC1.11
2017-11-23 22:21:19 -08:00
payonel
edf612a848
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-23 22:11:45 -08:00
payonel
56a4973e2b
npe protection for ae buses
2017-11-23 22:10:55 -08:00
payonel
d42499acf6
null check ae import/export/part interface buses
2017-11-23 19:06:28 -08:00
payonel
5e10991a3e
Merge remote-tracking branch 'origin/master-MC1.10' into master-MC1.11
...
ignore 1.10 changes made for AE as they do not have builds for 1.11
2017-11-23 17:18:39 -08:00
DrummerMC
823c9903a9
Add ExtraCells and Mekanism integration ( #2629 )
2017-11-23 14:48:15 -08:00
payonel
d8075ea40b
Merge branch master-MC1.10 into master-MC1.11
2017-11-23 13:33:35 -08:00
payonel
8f8974ac15
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-23 13:33:34 -08:00
payonel
7ec85999da
saving more memory and improving the vt100 library
...
move all vt100 code to vt100 library
delay load event rare code
fix shell parse for %d>&%d not followed by whitespace
remove weird tty blink code and use vt100 codes
bump openos patch version
2017-11-23 13:05:54 -08:00
SquidDev
5b0c085c2d
Miscellaneous tweaks to OpenOS ( #2636 )
...
* Parse Lua REPL inputs with an implicit "return "
If an input does not start with a leading "=", this will parse the input
with "return " appended and, if that fails, will parse as a normal
statement.
This allows for normal expressions to be entered into the repl (such as
`2 + 2`) but does mean the parse errors for malformed inputs are
confusing. For instance, `3 + ` will error at '3' rather than '<eof>'.
* Do not insert into history if a duplicate
This mimics the behaviour of shells such as bash or zsh, where
whitespace-only lines are not entered into history, nor are ones equal
to the previous input. This makes history navigation slightly easier.
2017-11-22 11:19:33 -08:00
payonel
e742af6112
fs.size loads more fs lib, should keep using exists
2017-11-17 14:09:21 -08:00
