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
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
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
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
DrummerMC
823c9903a9
Add ExtraCells and Mekanism integration ( #2629 )
2017-11-23 14:48:15 -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
payonel
f26cb54c28
allow .shrc to use tty stdin
2017-11-16 18:40:58 -08:00
payonel
5107afb176
fixes for bind remove and cleanup
2017-11-15 23:53:22 -08:00
payonel
7200990048
mount bind cleanup
2017-11-15 23:08:08 -08:00
payonel
5f3088c489
more efficient autorun
2017-11-15 22:57:53 -08:00
payonel
89abb6f30b
mount bind point support
2017-11-15 21:24:12 -08:00
payonel
ebb7dcc0d2
fix missing dev bug for install and let mount use existing dirs
2017-11-14 23:05:42 -08:00
payonel
a9c4529372
bump openos version string to 1.7.0
...
probably should have done this back when OC updated to 1.7
2017-11-13 13:49:29 -08:00
payonel
355a520977
allow custom error objects to print to stderr
2017-11-11 10:50:01 -08:00
payonel
e07954a02f
link to IDEA instructions for 1.7.10
2017-11-10 11:29:26 -08:00
payonel
bcac087612
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-08 22:00:30 -08:00
payonel
e62113de41
thaumcraft api version update
2017-11-05 17:25:31 -08:00
payonel
dafd15367a
better chip diamond recipe
2017-11-05 15:47:46 -08:00
payonel
14d4df3c71
remove thaumcraft api
...
it's not even being used in the build, and it was removed in >=1.11
2017-11-05 10:31:53 -08:00
payonel
592a73dd0c
check for nbt advDmg for custom damage
2017-11-02 09:51:03 -07:00
payonel
680a488bc5
Merge branch master-MC1.9.4 into master-MC1.10
2017-11-02 00:55:50 -07:00
payonel
d08dcd2c9d
Merge branch master-MC1.8.9 into master-MC1.9.4
2017-11-02 00:55:50 -07:00
payonel
2cd41d8b94
merge fix, cpw.mods.fml.common.Loader changed to net.minecraftforge.fml.common.Loader
2017-11-02 00:55:26 -07:00
payonel
b020be50d0
Merge branch 'master-MC1.9.4' into master-MC1.10
...
# Conflicts:
# build.gradle
2017-11-02 00:18:42 -07:00
payonel
6f115c1b3c
Merge branch 'master-MC1.8.9' into master-MC1.9.4
2017-11-02 00:17:39 -07:00
payonel
891e86e2df
Merge remote-tracking branch 'origin/master-MC1.7.10' into master-MC1.8.9
...
# Conflicts:
# .gitignore
# build.gradle
# build.properties
# src/main/scala/li/cil/oc/integration/ic2/ModIndustrialCraft2.scala
2017-11-02 00:17:12 -07:00
payonel
234554a060
protect slow boots from timeouts
2017-11-01 18:02:36 -07:00
payonel
868c101772
remove boot safe guard for boot on slow servers, it broke stuff. maybe revist another time
2017-10-31 00:17:00 -07:00
payonel
07791b9851
fix ic2-classic mod incompatibility
...
additionally:
remove dead code in openos transforms
safe guard openos boot from slow server tick
closes #2487
2017-10-30 23:14:54 -07:00
ChristoCoder
c930ec329e
Allow getting yaw of player through tablet component
2017-10-26 14:09:13 -07:00
Fingercomp
73c642dee8
Fix the Russian translation
2017-10-25 23:42:50 -07:00
payonel
2f1332f605
rename ru_RU.lang back to english path
2017-10-25 08:47:45 -07:00
S0ZDATEL
89bd057782
Fix a translation mistake.
...
Fixed wrong translation of "hover boots" that was like "rocket boots" or "jet boots".
Close #2579 .
2017-10-24 08:14:39 -07:00
payonel
5288efaa6a
check correct index on file handle
...
always worked before because all callers were checking 0 anyways
closes #2442
2017-10-16 18:04:31 -07:00
payonel
4075d6f16b
ignore vscode, and some build fixes
2017-10-16 18:03:06 -07:00
payonel
0123dce575
preserve original exception thrown for machine arch ctors
...
to not "eat" the original exception, we can just set it in the IllegalArgumentException's cause, see https://docs.oracle.com/javase/7/docs/api/java/lang/Throwable.html#getCause()
closes : #2146
2017-10-14 16:30:25 -07:00
Vexatos
845c607bfc
Merge branch 'master-MC1.9.4' into master-MC1.10
2017-10-14 18:45:35 +02:00
Vexatos
2e580f9e6c
Merge branch 'master-MC1.8.9' into master-MC1.9.4
2017-10-14 18:45:21 +02:00
Vexatos
d7bb35d6f0
Merge branch 'master-MC1.7.10' into master-MC1.8.9
2017-10-14 18:44:37 +02:00
