AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-14 09:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,018 Commits 29 Branches 143 Tags
Commit Graph

4018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
7207606960 Merge remote-tracking branch 'remotes/origin/updated_recipes' into master-MC1.7.10 2015-04-22 12:53:09 +02:00
Florian Nücke
57714dad27 Fixed ls -l in pure io mode. 2015-04-22 11:38:09 +02:00
Florian Nücke
4f70ea4152 Bump version number. 2015-04-22 11:22:33 +02:00
Florian Nücke
76172d0dfb Made env variables local (i.e. os.getenv/setenv will operate per process now), to avoid programs running in parallel (via piping) to interfere. 
Copying env vars from last process to shell's env to avoid breaking compat. (cd.lua will still work that way, e.g.)
Closes #634.
 2015-04-22 11:22:14 +02:00
Florian Nücke
6377a5824f sh.lua absorbed besh.lua's piping mechanics. RIP besh. 2015-04-22 10:43:34 +02:00
Florian Nücke
33bf52ae94 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-21 14:03:49 +02:00
Florian Nücke
6a811b6471 Fix oc_at.cfg in obf environment. 2015-04-21 14:03:15 +02:00
Florian "Sangar" Nücke
0b000b75bf Merge pull request #1095 from mpmxyz/patch-2 
Fix: standard io streams being closable
 2015-04-21 13:31:52 +02:00
Florian Nücke
886ebaae5e Fixed rebooting computers via Java API not working (i.e. calling stop() and start() in succession). 
This also fixes LuaJ computers not rebooting when loaded again.
 2015-04-21 12:32:35 +02:00
Florian Nücke
ce552ff99d Should avoid unexpected error if trying to tostring a method that's now filtered out. 
Clearing out callback cache when a world is unloaded.
 2015-04-21 12:02:02 +02:00
Florian Nücke
8a31eba5c3 Removed use of a few remaining reflection thingers, since we have an oc_at.cfg now anyway. 2015-04-21 11:36:23 +02:00
mpmxyz
690d664003 Fix: standard io streams being closable 
To be exact: Not the streams themselves but the buffers on top of them can be closed.
I noticed that because "ls" didn't display anything after some experiments involving an "stdout" file.
 2015-04-20 19:03:35 +02:00
Florian Nücke
a8389f7056 Documented GT recipe handlers in recipe set. 
Renamed a few things, simplified a few things, scalafied a few things.
 2015-04-20 12:44:34 +02:00
Florian "Sangar" Nücke
61ff63257b Merge pull request #1093 from natedogith1/master-MC1.7.10 
Fixed use of setRawDelay config option
 2015-04-20 10:34:16 +02:00
natedogith1
64dce8c4ba Fixed use of setRawDelay config option 2015-04-19 20:30:09 -04:00
Johannes Lohrer
b78c446c22 Merge branch 'updated_recipes' of github.com:MightyPirates/OpenComputers into updated_recipes 
Conflicts:
	src/main/scala/li/cil/oc/integration/gregtech/RecipeRegistry.scala
 2015-04-19 20:53:13 +02:00
Johannes Lohrer
7a248833b7 made additional outputs a sequence to allow additional machines 
so these commits should basically close #760
 2015-04-19 20:52:12 +02:00
Johannes Lohrer
f534e1b3b6 made additional outputs a sequence to allow additional machines 
so these commits should basically close #760
 2015-04-19 20:50:13 +02:00
Florian Nücke
05e4c07907 Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-19 16:43:37 +02:00
Florian Nücke
40bf4a31a3 Improved handling of tracking of changes to holograms to reduce bandwidth in certain cases some more. 
Slightly more bookkeeping, but that's relatively cheap.
 2015-04-19 16:42:55 +02:00
cyber01
346daf9e96 Fix #1086 in russian manual 2015-04-19 17:33:07 +03:00
Florian Nücke
2cf672807a Fixed a few issues with drones moving through portals. 
For one, they won't also drop themselves as items anymore.
For two, they won't shut down after moving through the portal anymore.
Also corrected the target position relocation.
 2015-04-19 14:55:47 +02:00
Florian Nücke
78ddda0426 Homogenized indentation in config. 2015-04-19 13:07:06 +02:00
Florian Nücke
30d722e19d Limit speed of hologram.setRaw a bit, to lower worst-case bandwidth use, but made it configurable. 
Also moved hologram server-side settings to extra category in config.
 2015-04-19 13:05:33 +02:00
Florian Nücke
7fc4d67dee Merge branch 'RU_doc' of https://github.com/cyber01/OpenComputers into master-MC1.7.10 2015-04-19 11:32:34 +02:00
Florian Nücke
dd975cc034 Merge branch 'patch-1' of https://github.com/CaitlynMainer/OpenComputers into master-MC1.7.10 2015-04-19 11:32:07 +02:00
Florian Nücke
662ef4722b Fixed a few links in manual, closes #1086. 
Thanks @rashdanml.
 2015-04-19 11:21:28 +02:00
Caitlyn
1dc12b54a5 fixed typo for Ink Cartridge 
<Kodos> Can you go PR into the proper branch of OC's en_US file to fix 'Ink Cartidge' to say Ink Cartridge
 2015-04-18 23:06:25 -05:00
cyber01
3fc9e96438 Updated russian translation 2015-04-19 04:11:44 +03:00
Johannes Lohrer
72a4a0e476 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into updated_recipes 
Conflicts:
	src/main/scala/li/cil/oc/common/recipe/Recipes.scala
 2015-04-18 22:34:58 +02:00
Johannes Lohrer
c81efe9779 moved recipes into own class for vanilla 
added gregtech recipe options
 2015-04-18 22:24:30 +02:00
Florian Nücke
be071be9a2 Made recipe set extraction a bit more generic, added the peaceful set. 2015-04-18 20:42:35 +02:00
Florian Nücke
8e024c3106 Merge branch 'master-MC1.7.10' of https://github.com/dgelessus/OpenComputers into master-MC1.7.10 2015-04-18 20:27:55 +02:00
Florian Nücke
cbd54883ac Bump version number. 2015-04-18 20:22:35 +02:00
Florian Nücke
02dd439e6a Allow redrawing holograms a tad faster, closes #1064. 
Also added a new method, `setRaw`, takes a string (byte array) with each byte being the color for a voxel. Allows setting the whole hologram data at once, allowing for even faster redrawing / swapping of states.
 2015-04-18 20:22:19 +02:00
dgelessus
0a14e0532e Add peaceful-friendly recipe file 
+ small tweak to default recipes
 2015-04-18 17:16:10 +02:00
Florian Nücke
87d25abcb2 Fixed absolute paths in manual. 2015-04-18 16:35:13 +02:00
Florian Nücke
060f3bb5d8 Fixed OpenOS being listed twice in creative tab/NEI. 2015-04-18 13:04:09 +02:00
Florian Nücke
1bda68f59d Merge branch 'patch-23' of https://github.com/Vexatos/OpenComputers into master-MC1.7.10 2015-04-18 12:58:29 +02:00
Florian Nücke
e4dc95580d Emitting particle effects from robots when they try to move but fail, as a visual indicator. 
Added forced pause even if move fails, to avoid particle spam. Makes detect() a bit more useful (since that'll now be faster than just trying to move).
 2015-04-18 12:54:33 +02:00
Florian Nücke
d03e78b0cb Made time limit enforcement in __gc wrapper more memory friendly, closes #1079. 2015-04-17 20:14:51 +02:00
Florian Nücke
c62feb7136 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-04-17 18:41:27 +02:00
Florian Nücke
e1bad9735f Centralized logic that prints last computer crash reason when analyzed. 
This way it'll also work for third-party machines.
 2015-04-17 18:40:22 +02:00
Florian "Sangar" Nücke
170cb4a406 Merge pull request #1078 from cyber01/RU_doc 
Russian translation for manual
 2015-04-17 18:39:27 +02:00
cyber01
a619c0dd11 Added russian translation for manual 2015-04-17 18:51:07 +03:00
Florian Nücke
c42334ba16 Fixed previous commit breaking computers after stopping once. 2015-04-17 13:36:14 +02:00
Florian Nücke
15f5609a0e Should fix potential leakage of drones. 
Cleaned up robot name list a bit.
 2015-04-17 13:08:33 +02:00
cyber01
32e3b7a06d Create branch 2015-04-16 12:48:22 +03:00
Florian Nücke
effe8ebea1 Merge branch 'patch-1' of https://github.com/shadowkat10/OpenComputers into master-MC1.7.10 2015-04-16 11:17:02 +02:00
Florian Nücke
2b2c8ce401 Merge branch 'patch-1' of https://github.com/KamranMackey/OpenComputers into master-MC1.7.10 2015-04-16 11:14:56 +02:00