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

2036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
53d385ca19 Properly converting loot and os floppies to plain floppies when wiping them (shift-rightclick) so they stack. 2014-08-21 23:40:32 +02:00
Florian Nücke
333f0d7c11 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-21 07:35:28 +02:00
Florian Nücke
347c023205 Fixed a derp in the fix for the broken fix for the thing. 2014-08-21 07:34:22 +02:00
Florian Nücke
bc00fbb1cb Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-21 01:47:44 +02:00
Florian Nücke
79cd490543 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-21 01:44:12 +02:00
Florian Nücke
5e20f38009 Fixed for for potential race condition fixing it the wrong way around (markChanged in envs now properly handles async calls, avoiding potentially triggering chunk loads when it shouldn't). 2014-08-21 01:43:27 +02:00
Florian Nücke
3812128b8c Updated natives, using libs with debug symbols for dev branch now. 2014-08-21 01:32:26 +02:00
Florian "Sangar" Nücke
87476dca87 Merge pull request #506 from Atuto/master 
Update robot.names
 2014-08-20 20:23:16 +02:00
Atuto
f3ee1454af Update robot.names 
Added Callister Raynes.  http://eureka.wikia.com/wiki/Callister_Raynes
 2014-08-19 19:11:59 -05:00
Atuto
7724844b5d Update robot.names 
Added Deputy ANDY from Eureka. http://eureka.wikia.com/wiki/ANDY
 2014-08-19 19:02:59 -05:00
Florian Nücke
c4a81a2270 Making OpenOS's init script pause before firing up the default shell to allow the init signal (and thus autorun scripts) to be processed before the shell calls term.read(). Closes #504, I guess. 2014-08-19 21:48:35 +02:00
Florian Nücke
50cd1100ff Added two more debug settings to hopefully allow debugging native lib related issues better. 2014-08-19 21:47:07 +02:00
Florian Nücke
2b0b74fd9b Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-18 23:14:27 +02:00
Florian Nücke
ca8139b7ff Typo in docstring for screen.setTouchModeInverted. 2014-08-18 23:14:16 +02:00
Florian "Sangar" Nücke
5791c05540 Merge pull request #495 from magik6k/master 
Add OpenLoader Loot disk
 2014-08-18 22:54:33 +02:00
Florian "Sangar" Nücke
70a159ac6d Merge pull request #500 from ds84182/patch-1 
space space I wanna go to space
 2014-08-18 22:28:08 +02:00
Dwayne Slater
65f5806a93 sortato. SPAAAAAAAAAAAAAAAAAAAAAAACE. 2014-08-18 16:18:50 -04:00
Dwayne Slater
c4d860ceaf space space I wanna go to space 
QUICK: WHAT'S THE SITUATION? Oh, hey, hi pretty lady. My name's Rick. So, you out having a little adventure?
What's your favorite thing about space? Mine is space.
The likelihood of you dying violently within the next five minutes is eighty-seven point six one percent.
 2014-08-18 08:03:32 -04:00
WarwickAllison
4f01087652 Add Find (CTRL-F) to edit. 2014-08-18 09:22:38 +10:00
WarwickAllison
fa8b9600cc Add CTRL-DEL to delete line. 2014-08-18 09:21:46 +10:00
Florian Nücke
1d060db485 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-17 00:54:35 +02:00
Florian Nücke
c05ff8fb81 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-17 00:54:09 +02:00
Florian Nücke
04114e68b8 Made screen T2 and raw circuit board recipes use oredict dyes, closes #493. 2014-08-17 00:53:28 +02:00
Florian "Sangar" Nücke
a46f71c72c Merge pull request #497 from gamax92/gpu_fix 
Make init.lua do exact component matching
 2014-08-17 00:39:56 +02:00
Florian Nücke
4508e4f45e Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 
Conflicts:
	build.properties
 2014-08-16 23:52:24 +02:00
Florian Nücke
f169cae801 Fixes a potential NPE in adapter if block driver returns null environment. 2014-08-16 23:49:55 +02:00
Florian Nücke
e0a7e75027 Fixed a memory leak on world unload, should close #498. 2014-08-16 23:38:37 +02:00
James Coon
cd6011ab20 Make init.lua do exact component matching 
Fixes init.lua randomly picking a different component that may happen to share "gpu" in the name.
 2014-08-16 12:56:52 -06:00
Florian Nücke
0c43456e5f Also updating Adapter via onNeighborTileChange, closes #496 (hopefully). 2014-08-16 13:33:09 +02:00
Florian Nücke
bd258a9dd4 Adjustments for release. 2014-08-16 13:13:39 +02:00
Łukasz Magiera
d422d89cf4 Add OpenLoader Loot disk 2014-08-16 01:46:48 +02:00
Florian Nücke
b664f07c52 Adjustments for release. 2014-08-15 17:01:08 +02:00
Florian Nücke
ebd477aa21 Added setting to allow changing the color of monochrome (one-bit color depth) text (tier one screen / GPU), closes #459. v1.3.3 2014-08-15 13:27:44 +02:00
Florian Nücke
12082391bb Made hologram max scale setting use doubles instead of ints for more flexibility and reworded the comment in the config a little. 2014-08-15 01:29:23 +02:00
Florian Nücke
5ba5b3cea8 Merge https://github.com/xedp3x/OpenComputers 2014-08-15 01:21:19 +02:00
Florian Nücke
3a9f6b0311 Made filesystem.isLink return the destination of the link as a second value, if it is one. 2014-08-15 01:04:38 +02:00
Florian Nücke
9327762d95 Autoconverting Iterables, e.g. for cases like return new Object[]{hashMap.values()} (hope this doesn't break anything). 
Added special key for converters, `oc:flatten`. If there is only key in the converted table and it has that name, the value of that key will be used directly.
 2014-08-15 01:00:35 +02:00
Florian Nücke
7b390601f7 Slightly reworked hologram.fill(), now may take an additional param, the lower end of the interval to fill, and won't "autoclear" (will now only overwrite in that interval), which *may* break some programs. I'm so sorry. A little. 2014-08-14 15:55:26 +02:00
Florian "Sangar" Nücke
52252ec49a Merge pull request #487 from Vexatos/patch-10 
Yet another OPPM update
 2014-08-14 14:36:30 +02:00
Vexatos
39c7ab5522 Yet another OPPM update 
Hopefully this fixes dependency installation problems. I need some testers!
 2014-08-14 14:33:04 +02:00
XEdP3X
986ed58c58 transfer hologramMaxScaleByTier to the config file 2014-08-14 11:17:03 +02:00
XEdP3X
1df0804608 transfer hologramMaxScaleByTier to the config file 2014-08-13 18:34:38 +02:00
Florian Nücke
ea88404d90 Fixed servers being able to boot if a component bus was present but no CPU. 2014-08-13 16:50:40 +02:00
Florian Nücke
30bdf3577b Marking the slot enum related methods in the API as deprecated instead, less spam when building for people using the API. 2014-08-13 16:44:50 +02:00
Florian Nücke
2c87f6059a Disabling Lua GC while persisting and unpersisting, might help with native crash. 2014-08-12 18:36:18 +02:00
Florian Nücke
891efc924e Still can't remember why top-level coroutine.yield() in programs wouldn't pull events... nothing seems to break, so there. Closes #483. 
Also made sh add traceback to message when program crashes.
 2014-08-12 16:23:46 +02:00
Florian Nücke
034f28ca05 Added a debug card item, allows manipulating the world some to make it easier to test stuff. 2014-08-12 15:52:14 +02:00
Florian Nücke
4d8baa7efa Fixed computers failing to save when saved while performing a synchronized call on userdata. 2014-08-12 15:16:59 +02:00
Florian Nücke
a2e2a9b72e Fixed index out of bounds in term.isWide, closes #484. 2014-08-12 02:51:17 +02:00
Florian Nücke
df9438db8e Made creative tier case only changeable when in creative mode, closes #476. 
Made robots respect inventory.isUsableByPlayer.
 2014-08-12 02:16:54 +02:00