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
|
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
|
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
|
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
|
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 |
|
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
|
33e70a8f6c
|
Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
# build.gradle
# build.properties
|
2017-10-14 18:46:31 +02: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 |
|
Vexatos
|
fd5fd98c84
|
Subversion no more.
v1.7.0
|
2017-10-14 18:43:25 +02:00 |
|
Vexatos
|
b2788b1932
|
Merge branch 'master-MC1.10' into master-MC1.11
# Conflicts:
# build.properties
|
2017-10-14 18:36:16 +02:00 |
|
Vexatos
|
53bc6bb54a
|
Merge branch 'master-MC1.9.4' into master-MC1.10
|
2017-10-14 18:35:37 +02:00 |
|
Vexatos
|
8890422cbd
|
Merge branch 'master-MC1.8.9' into master-MC1.9.4
|
2017-10-14 18:35:14 +02:00 |
|
Vexatos
|
d0a20b6649
|
Merge branch 'master-MC1.7.10' into master-MC1.8.9
|
2017-10-14 18:34:47 +02:00 |
|
Vexatos
|
4fffcccd98
|
Version bump.
|
2017-10-14 18:34:12 +02:00 |
|
/Fox --develop
|
30e05b9c4f
|
Updated link to Lua code conventions
|
2017-10-04 14:52:43 -07:00 |
|
Vexatos
|
795762df85
|
Re-added IC2 integration.
Hopefully it works.
(cherry picked from commit 151ddecb2c305d6827c183d384690761272d5e16)
|
2017-10-04 20:12:16 +02:00 |
|
payonel
|
228d8c1a13
|
Merge branch master-MC1.9.4 into master-MC1.10
|
2017-10-03 12:33:15 -07:00 |
|
payonel
|
d7177d0233
|
Merge branch master-MC1.8.9 into master-MC1.9.4
|
2017-10-03 12:33:15 -07:00 |
|