5597 Commits

Author SHA1 Message Date
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
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
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
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
payonel
d7177d0233 Merge branch master-MC1.8.9 into master-MC1.9.4 2017-10-03 12:33:15 -07:00
payonel
eb9d8536f9 Merge branch master-MC1.7.10 into master-MC1.8.9 2017-10-03 12:33:15 -07:00
payonel
f1b953c7aa introduce screens to gpus in robot components
GPUs have neighbor visibility, and screens have network visibility. But in a robot the gpu and screen are sibling components, with edges to the machine, but without edges to each other. Thus during load they are not connected to each other (regardless of load order). Robots already have a provision for this issue for connecting screens to keyboards and keyboards to screens, but lacked a custom screen->gpu connection. This code change simply adds that search and connects all screens to all gpus.

closes #2302
2017-10-03 12:31:38 -07:00
payonel
c5bb6221cb Merge branch master-MC1.8.9 into master-MC1.9.4 2017-09-28 11:23:28 -07:00
payonel
be05dc5bec Merge branch master-MC1.7.10 into master-MC1.8.9 2017-09-28 11:23:28 -07:00
payonel
066fc4b784 protect dispatch from callbacks that unregister handlers
closes #2528
2017-09-21 13:49:16 +02:00
payonel
55f8381e67 Merge branch 'master-MC1.8.9' into master-MC1.9.4 2017-09-17 11:48:14 +02:00
payonel
e7073e4fd5 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-09-17 11:47:27 +02:00
payonel
2abd8b3134 closes #2507
/bin/less and /bin/more were able to lock up the system if they call string.gsub(string, function) on a very large string (~144k chars long).
The machine layer intercepts expensive strings calls by checking the length of the string, but it does not intercept gsub calls when the replace action is a function

The fix is to intercept all long string actions, not just non-function replacement gsub calls

Note that /bin/more is now more efficient and doesn't call string.gsub, but this is still the right fix to keep the sandbox from being able to lock up the system with string methods
2017-09-17 11:30:19 +02:00
payonel
47c67a119f term fixes, scroll methods was moved 2017-09-16 08:19:49 +02:00
payonel
5c9760cf77 thread code cleanup for clarity, no api change 2017-09-13 10:46:17 -07:00
payonel
6190d75c37 more cats
improve cat io by directly feeding stream data to output and optimize more to not use line parsing
2017-09-12 15:26:25 -07:00
payonel
5b812239a1 Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4 2017-09-11 08:57:51 -07:00
payonel
35e51459b4 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-09-11 08:57:29 -07:00
payonel
0b767e6c7c fix cat when input is tty 2017-09-11 08:09:08 -07:00
payonel
9d544b3731 tty and term fixes and correctness
* term.pull fix, the tty stream no longer needs a cursor object
* buffer reads now pass the original result and reason all the way back. this allows /bin/sh to distinguish ^c from ^d
* /bin/sh cleanup to not show prompt when there is no input tty
2017-09-10 23:33:13 -07:00
payonel
e810b556e1 Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4 2017-09-10 01:03:23 -07:00
payonel
fc314fb3c9 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-09-10 01:02:57 -07:00
payonel
d8033669eb optimizations and fixes
* /bin/cat chunk based [huge performance and memory savings, can handle enormous files now]
* /bin/sleep blinks now
* removed unnecessary methods from tty
* cursor blinking and scrolling terminal improvements
* fixed bad term call to tty write
2017-09-10 00:58:54 -07:00
payonel
8af5c0d056 further serialization cleanup 2017-09-08 20:01:25 -07:00
payonel
1bc6e84af2 use a growing vector of string parts to serialize a string, returning table.concat when done 2017-09-08 20:01:25 -07:00
payonel
eaf2b0cf8a ignore the robot magic filesystem with install, and small /bin/sleep fix
/bin/sleep ^c was printing an error because it was returning the event data, which prompts was interpretting as error details [unexpected]
use a .prop file to have the robot component magic fs be ignored when running `install`
2017-09-08 00:49:50 -07:00
payonel
81ffb2187b Merged contribution from BillyJimson
https://github.com/MightyPirates/OpenComputers/pull/2324
2017-09-07 18:13:15 -07:00
payonel
ae501a859d return true from thread method as per documented specification 2017-09-07 10:34:47 -07:00
payonel
fc486d4bd2 openos 1.6.8 update
Changes

* thread: fix coma state issue where thread would not resume
* thread: add thread.current(), returns current thread [ the init thread is still technically not a thread ]
* tty: simplify the api with read, and separate all stream methods from the library
* sleep: /bin/sleep will now show blinking cursor and can be interrupted
* echo: use io.write instead of print. print loads slightly more resources
2017-09-07 08:40:30 -07:00
payonel
a1512451fe support s and u vt100 codes
strangely, the real terminal appears to treat [su] the exact same as [78] even though the specification says [su] is position only
2017-08-23 12:24:05 -07:00
payonel
c4c3811376 revert removal of process.running -- some scripts still use it 2017-08-22 11:22:06 -07:00
payonel
a4b470e166 Merge remote-tracking branch 'upstream/master-MC1.8.9' into master-MC1.9.4 2017-08-08 18:47:44 -07:00
payonel
cc4cc2d5e9 Merge remote-tracking branch 'upstream/master-MC1.7.10' into master-MC1.8.9 2017-08-08 18:47:00 -07:00