AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-25 05:55:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,181 Commits 29 Branches 143 Tags
Commit Graph

1181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
41ebd349ea Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-12 00:54:43 +01:00
Florian Nücke
80595a8583 forcing going into fallback mode on windows server 2003 to avoid crash 2014-02-12 00:54:15 +01:00
Florian Nücke
d2d964bc8b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/item/ALU.scala
	src/main/java/li/cil/oc/common/item/Alu.scala
	src/main/java/li/cil/oc/server/component/FileSystem.scala
	src/main/java/li/cil/oc/server/component/Filesystem.scala
	src/main/scala/li/cil/oc/common/item/Alu.scala
	src/main/scala/li/cil/oc/server/component/Filesystem.scala
 2014-02-12 00:24:44 +01:00
Florian Nücke
0e183f8b91 added second tier 1 ram slot to tier 1 case to make tier 1 computers more useful (the ingame component callback doc implementation - wrapping the callbacks as a table - consumes a bit more memory before for each proxy, this is in response to that) 2014-02-11 23:55:27 +01:00
Florian Nücke
a0e5e43ea3 Also removed UDP mention from Russian localization - I hope I didn't screw it up. 2014-02-11 23:44:14 +01:00
Florian Nücke
f32655ac65 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-02-11 23:40:30 +01:00
Florian Nücke
19e73e2cf3 corrected filename casing 2014-02-11 23:39:58 +01:00
Florian Nücke
c4da02b65c removed mention of udp from internet cards, those were a lie; text.serialize now line breaks and indents in pretty print mode; tostringing tables with metatable that has a __tostring method in text.serialize with pretty print; corrected comment in config; explicitly putting textures and localizations into the public domain in the license info; deleting empty file system folders from disk on save to reduce clutter in <saves>/opencomputers dir; doc field of callback annotations can now be read in computers, methods in proxies are tostring'ed to the docstring; returning false from component.modem.close() when no ports are open, now 2014-02-11 23:35:46 +01:00
lordjoda
1cf2a439da Merge pull request #115 from YuRaNnNzZZ/master 
Added Russian localization.
 2014-02-11 16:50:56 +01:00
YuRaNnNzZZ
e325d20e98 Create ru_RU.lang 
Added Russian localization.
 2014-02-11 03:26:50 -08:00
Florian Nücke
81e900bfef added new Keyboard implementation so that keyboard only works on proper sides again, still keeping the old one around for upgrading. 2014-02-10 23:40:42 +01:00
Florian Nücke
9c3e6fca80 adjustments for 1.7 2014-02-10 22:45:52 +01:00
Florian Nücke
ac034907fe Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/tileentity/Cable.scala
	src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala
	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
 2014-02-10 22:38:49 +01:00
Florian Nücke
f48d3d304e using tick handler instead of scheduled tick updates to register non-ticking tile entities in the component network 2014-02-10 22:36:08 +01:00
Florian Nücke
bcde36e74c renamed localization keys to be more standard conform 2014-02-10 22:12:14 +01:00
Florian Nücke
a401858a80 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
 2014-02-10 18:24:40 +01:00
Florian Nücke
38c231ed71 fixed some bugs; added readme in api package; marked cc filesystem factory methods optional 2014-02-10 18:16:16 +01:00