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

2054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
de9fe79ff0 Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers 2014-07-11 17:21:17 +02:00
Florian Nücke
aa30297a3e Adjusted motion sensor recipe. 2014-07-11 17:17:17 +02:00
gamax92
b9756bc554 Add some more functionality to string.format 2014-07-11 09:15:57 -06:00
Florian Nücke
bf79d15a25 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-11 17:08:06 +02:00
Florian Nücke
739d0ab892 Fixed recursive recipe includes. Closes #387. 2014-07-11 17:05:22 +02:00
Florian Nücke
539ceb83a1 Made it possible to define colors for loot disks. 2014-07-11 16:48:14 +02:00
Florian Nücke
c9e441caba By popular demand, floppy disks can now be dyed by crafting them together with the according dye. Closes #388. 2014-07-11 16:20:58 +02:00
Florian Nücke
f7540d412e Added option to allow robots to get a table representation of item stacks using the inventory controller upgrade. Off by default. Closes #385. 2014-07-11 14:40:03 +02:00
Florian Nücke
45891ea79f Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-11 14:13:01 +02:00
Florian Nücke
5e268af84b Added safety try-catch to machine loading code, to avoid crashes for unexpected states. 
Added callback doc for experience upgrade and chunkloader upgrades.
 2014-07-11 14:10:54 +02:00
Florian Nücke
7e7f1e80cf Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-10 11:25:34 +02:00
Florian Nücke
d24907b7ab Fixed keyboard behavior some. 
I'm not really happy with this fix, because it adds special behavior for multiblock screens where it shouldn't be, but meh.
 2014-07-10 11:25:11 +02:00
Florian Nücke
0bab1239af Dev? Dev! 2014-07-09 23:07:25 +02:00
Florian Nücke
a3bedd9945 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-09 23:07:03 +02:00
Florian Nücke
139ffc9f4a Making sure paths used for file system data storage (hdds, floppies) are directories or don't exist by trying to delete them if they're files, instead of just giving up - since apparently these can appear in some obscure scenario that can't be reproduced anymore. 2014-07-09 23:05:50 +02:00
Florian Nücke
b8a998a5fa Merge branch 'new-toys' 2014-07-09 20:00:24 +02:00
Kilobyte22
9c1d54f4ed Changed a couple things regarding Switches 2014-07-09 19:00:12 +02:00
Florian Nücke
4e8a48a56f Catching potential errors in __gc methods when persisting computers. 2014-07-09 17:37:36 +02:00
Florian Nücke
bf9de41a7b Fixed a potential (non-crashing) NPE. 2014-07-09 17:21:32 +02:00
Florian Nücke
5274cb8da0 Corrected mistake in onConnect/onDisconnect examples in JDoc of Environment interface in API. 2014-07-09 17:05:04 +02:00
Florian Nücke
c124a650df Improved performance of component callbacks. 
Enforcing tighter time limit on user __gc methods.
 2014-07-09 17:00:06 +02:00
Kilobyte22
71b83402ab Changed some references in favour of cleaner code 2014-07-09 16:13:03 +02:00
Kilobyte22
6580ce490c Changed most things noted on in last PR 2014-07-09 15:20:00 +02:00
Kilobyte22
cce4239a0e Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-07-09 14:45:55 +02:00
Florian Nücke
e03e63323c Bumpitybump. v1.3.0 2014-07-08 20:40:19 +02:00
Florian Nücke
b9d1a37b28 Merge pull request #383 from gamax92/LuaJSucks 
Fix More LuaJ things.
 2014-07-08 18:40:27 +02:00
Florian Nücke
972b12500a Fixed 'screen.getAspectRatio' value being recomputed incorrectly. 2014-07-08 16:37:45 +02:00
Florian Nücke
4095c0eda8 Made native library loading less... special-case-laden. Just try each and every shipped library until one works. 2014-07-08 15:10:58 +02:00
Florian Nücke
6b7120607a Fixed derp in OpenIRC's /lua command. 2014-07-08 13:13:21 +02:00
gamax92
cf51cd2591 Just a little note 2014-07-07 21:51:40 -06:00
gamax92
d38e08f102 fix txtToken, lexerror 2014-07-07 21:42:53 -06:00
Florian Nücke
a81fc4431d Merge pull request #381 from gamax92/LuaJSucks 
Make two error messages more useful
 2014-07-08 04:30:40 +02:00
gamax92
ea4c3c754b Make two error messages more useful 2014-07-07 20:28:40 -06:00
Florian Nücke
6c68e1a97f Merge pull request #380 from gamax92/LuaJSucks 
Error on invalid escape sequences
 2014-07-08 03:31:52 +02:00
gamax92
0f6a405d12 Why are there braces? 2014-07-07 19:30:36 -06:00
gamax92
87f6262230 Error on invalid escape sequences 
Also reformatting
 2014-07-07 19:24:11 -06:00
Florian Nücke
3576e76544 Merge pull request #379 from gamax92/LuaJSucks 
Fix string.rep crashing
 2014-07-08 02:42:06 +02:00
gamax92
f2a9e3fafa Fix string.rep crashing 2014-07-07 18:36:46 -06:00
Florian Nücke
39a03afc11 Fixed file handles not being manually closed in process.load (but relying on __gc, which fails in LuaJ). 2014-07-08 00:47:00 +02:00
Florian Nücke
ab7cc5d4ba Pleasedontbreakpleasedontbreakpleasedontbreak. 2014-07-07 18:16:56 +02:00
Florian Nücke
b4639cceb1 Fixed Geolyzer docstring. 
Potential fix for config parse error.
 2014-07-07 16:31:46 +02:00
Florian Nücke
caacec21bd LuaJ 3 Final. I'm not sure this is a good idea, but nothing seems to break (immediately). 2014-07-07 04:37:19 +02:00
Florian Nücke
e8384b67e0 Fixed userdata not being properly unwrapped when passed to direct callbacks. 2014-07-07 04:08:27 +02:00
Florian Nücke
a9e3cd907c Made it so that robots can also send and receive wired network messages. 2014-07-07 01:34:41 +02:00
Florian Nücke
26c4fa4161 Made userdata delegate tostring to the object's toString method (i.e. tostring(userdata) == Value.toString()). 2014-07-06 23:36:31 +02:00
Florian Nücke
4b4885b65c Fixed computers crashing when mods cause computers to pause (context.pause(...)) in a direct callback (@Callback(direct = true)). 2014-07-06 22:38:56 +02:00
Florian Nücke
a9efeb6b26 Added tractor beam upgrade (item magnet). 2014-07-06 21:03:45 +02:00
Florian Nücke
39704f9532 Merge pull request #376 from Sodiet/patch-3 
Update ru_RU.lang
 2014-07-06 18:15:36 +02:00
Florian Nücke
127aee1c45 Merge pull request #377 from Kilobyte22/nobreak 
Make io.read() support support not breaking
 2014-07-06 18:14:58 +02:00
Kilobyte22
6441ce9e28 Small variable name change 2014-07-06 18:13:13 +02:00