1048 Commits

Author SHA1 Message Date
Florian Nücke
5576abdb73 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
2014-02-22 14:06:25 +01:00
Florian Nücke
b5bd97807c fixed file system labels not being saved. oops. 2014-02-22 13:45:43 +01:00
Florian Nücke
6d54fffdbe some cleanup; moved language specific file system (lua/rom) to lua architecture 2014-02-20 09:48:12 +01:00
Florian Nücke
83860523a7 synchronizing filesystem component and making open/read/seek/close limited direct calls, reduced default max read buffer in turn. this should give better performance when reading many small files; made fs.close direct without limit to get rid of the ugly file handle gc workaround involving a timer 2014-02-20 09:22:42 +01:00
Florian Nücke
02827f69b7 moved process management from shell to kernel and exposing it via new process api, removes some nasty cross dependencies 2014-02-20 09:18:06 +01:00
Florian Nücke
93ad467490 fixed flipped doc in screen 2014-02-20 09:11:02 +01:00
Florian Nücke
900e08af8a copied license files to repo root for visibility 2014-02-19 23:38:09 +01:00
Florian Nücke
235acf922d checking for changes in tool slot in all activation cases now, fixes #124 2014-02-19 13:54:57 +01:00
Florian Nücke
9b437ed8f3 resolving relative paths in PATH based on current working dir 2014-02-19 00:41:56 +01:00
Florian Nücke
f7324515b9 made io.stderr an extra stream that applies a red foreground color (if possible); writing errors to stderr in programs; quoting and escaping vars in list displayed by set.lua 2014-02-19 00:37:54 +01:00
Florian Nücke
2b4124356f Merge pull request #123 from Wobbo/master
Given the shell some love. (set and unset for env vars)
2014-02-18 23:49:12 +01:00
Wobbo
172ef642ef Update set.lua 2014-02-18 23:43:16 +01:00
Wobbo
6b1ddeb629 Added to default shell variables and added set and unset to set/unst said variables 2014-02-18 23:27:27 +01:00
Florian Nücke
4f69925cb8 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
2014-02-18 22:58:41 +01:00
Florian Nücke
949b0c0023 updated to UE 3.1 api, closes #122 2014-02-18 22:52:23 +01:00
Florian Nücke
f2b128b3fb added program components to list all attached components and their addresses (because i got tired of typing for _,n in component.list() do print(n) end) 2014-02-18 22:37:55 +01:00
Florian Nücke
217a836075 added '.' to the end of the path so people don't have to call programs via ./script; returning env table from os.getenv if no name is given; trying to get nicer names for blocks attached to the adapter 2014-02-18 22:35:29 +01:00
Florian Nücke
3f8798f1f6 fixed path resolving in shell (not always looking in current dir first) 2014-02-18 22:04:49 +01:00
Florian Nücke
6ed12e4f79 limiting length of pretty text.serialize by lines instead of chars, closes #120 2014-02-17 21:53:16 +01:00
Florian Nücke
edbc9fd44e keeping quote chars and escape chars in text.tokenize for context in expandvars in shell 2014-02-17 21:21:11 +01:00
Florian Nücke
1845ba0e17 synchronized functions in zip filesystem and moved try-catch in factory method, hopefully prevents issues in mcpc+; allowing any type of value as os env var for more flexibility where needed 2014-02-17 20:04:39 +01:00
Florian Nücke
5a162c8058 moved some more stuff to os env; better handling of os.exit in shell.execute (and lua interpreter) 2014-02-17 03:16:39 +01:00
Florian Nücke
d6d0cf2092 moved path info to os env stuff; fixed a *really* stupid bug in path resolving in the shell 2014-02-17 02:43:38 +01:00
Florian Nücke
183f00b398 added os.getenv and os.setenv; cleaned up and patched redirect parsing; added variable expansion and groundwork for further stuff to shell (contributed by @Wobbo) 2014-02-17 02:13:26 +01:00
Florian Nücke
4c1594023b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-16 18:17:47 +01:00
Florian Nücke
0c37b69422 fixed some bugs in text.serialize 2014-02-16 18:17:21 +01:00
Florian Nücke
5d8c3cc251 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-16 02:48:04 +01:00
Florian Nücke
b1a3339b4f improved tooltip wrapping a bit, basing it on the actual width of the rendered width (using the font renderer), and force wrapping long 'words', which allows actually wrapping Chinese text, e.g. 2014-02-15 00:58:31 +01:00
Florian Nücke
05858db34e added zh_TW to pack.mcmeta 2014-02-15 00:13:12 +01:00
Florian Nücke
7bb0c1df0a Merge pull request #117 from mymagadsl/patch-1
Create zh_TW.lang
2014-02-14 23:48:08 +01:00
mymagadsl
e7f400ae50 Create zh_TW.lang 2014-02-15 03:12:31 +08:00
Florian Nücke
40fd6f6332 minor cleanup and appending '-devNNN' to version in mcmod.info (for jenkins) v2.0.0 2014-02-14 13:25:12 +01:00
Florian Nücke
00702f2389 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-14 13:23:14 +01:00
Florian Nücke
be03d58283 added ru_RU entry to pack.mcmeta v1.2.0 2014-02-14 13:14:48 +01:00
Florian Nücke
a713e3d30c fixed error when loading filesystems in upgraded 1.6 world 2014-02-13 21:32:43 +01:00
Florian Nücke
2567b0be82 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-13 21:19:29 +01:00
Florian Nücke
f8d49047dc corrected and clarified the comment on ram sizes in the config 2014-02-13 21:18:59 +01:00
Florian Nücke
5666e02f61 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-13 20:52:56 +01:00
Florian Nücke
946cefed5c minor cleanup 2014-02-13 20:52:25 +01:00
Florian Nücke
2a4cfa7aa4 adjusted Russian localization 2014-02-13 20:12:37 +01:00
Florian Nücke
19bd531443 using platform specific line endings in config file (there ya go, notepad users) 2014-02-12 19:05:53 +01:00
Florian Nücke
4c19d06c97 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/Recipes.scala
2014-02-12 15:49:48 +01:00
Florian Nücke
b931baeb72 changed a couple of failure cases to return nil, message instead of false, message, for consistency 2014-02-12 14:51:52 +01:00
Florian Nücke
4f9dbf3881 component inventory now clears the tag items are saved to before calling their save method, to behave like tile entities when saving (i.e. get a clean tag, so old stuff doesn't have to be deleted manually); reworked recipe registration to add a pre-registration step that's done right in the item instantiation, keeping things in one place (less likely to forget adding recipes) 2014-02-12 14:41:33 +01:00
Florian Nücke
fde1488578 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
2014-02-12 13:26:06 +01:00
Florian Nücke
f639ecb00f Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-02-12 13:11:00 +01:00
Florian Nücke
4099592f19 fixed wget help 2014-02-12 13:10:22 +01:00
Florian Nücke
44ae3dc68a Merge pull request #116 from YuRaNnNzZZ/patch-1
Update ru_RU.lang
2014-02-12 13:07:18 +01:00
Florian Nücke
67ed9876ad fixed robot "orientation" not being properly set when breaking blocks, which made some tools behave incorrectly if they did custom raytracing; added special check for TC tools to offset fake player position for raytracing 2014-02-12 07:10:01 +01:00
YuRaNnNzZZ
c9cdae9cce Update ru_RU.lang 2014-02-11 19:37:23 -08:00