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
56e4db9cdd
Merge branch master-MC1.11 into master-MC1.12
2017-11-23 17:21:56 -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
DrummerMC
62d3afbf5a
[1.12] Re-added AE, ExtraCells and Mekanism Integration ( #2631 )
...
* Re-added AE, ExtraCells and Mekanism Integration
* use api jar
* Minimum EC version is 2.5.2 not 2.2.2
2017-11-23 14:47:15 -08:00
payonel
d8075ea40b
Merge branch master-MC1.10 into master-MC1.11
2017-11-23 13:33:35 -08:00
payonel
18592726c4
Merge branch master-MC1.11 into master-MC1.12
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
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
c0cb3695fc
Merge branch master-MC1.11 into master-MC1.12
...
# Conflicts:
# build.properties
2017-11-08 22:03:51 -08:00
payonel
57a86cced1
Merge branch master-MC1.10 into master-MC1.11
...
# Conflicts:
# src/main/resources/assets/opencomputers/recipes/default.recipes
2017-11-08 22:02:49 -08:00
payonel
bcac087612
Merge branch master-MC1.7.10 into master-MC1.10
2017-11-08 22:00:30 -08:00
payonel
e3a47c5b44
use data.container to access the tablet's disk drive, not the entire tablet inventory stack
2017-11-08 21:57:37 -08:00
payonel
e62113de41
thaumcraft api version update
2017-11-05 17:25:31 -08:00
payonel
369e4e42ff
update tis version
2017-11-05 17:08:01 -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
49ad9f0a03
Merge branch master-MC1.11 into master-MC1.12
2017-11-02 01:01:35 -07:00
payonel
581a6308ac
fix 1.11 merge mistake
2017-11-02 01:01:26 -07:00
payonel
680a488bc5
Merge branch master-MC1.9.4 into master-MC1.10
2017-11-02 00:55:50 -07:00
payonel
df9ac5573b
Merge branch master-MC1.11 into master-MC1.12
2017-11-02 00:55:50 -07:00
payonel
d4cfba3c91
Merge branch master-MC1.10 into master-MC1.11
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
e2675c51ba
Merge branch 'master-MC1.11' into master-MC1.12
...
# Conflicts:
# .gitignore
2017-11-02 00:48:20 -07:00
payonel
f38ac8bc80
Merge branch 'master-MC1.10' into master-MC1.11
...
# Conflicts:
# build.gradle
# src/main/resources/assets/opencomputers/lang/ru_RU.lang
# src/main/scala/li/cil/oc/integration/Mods.scala
2017-11-02 00:46:14 -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
