1742 Commits

Author SHA1 Message Date
Florian Nücke
4f73a83c76 Fixed aliases with arguments killing of actual arguments.
Made cp more like real cp (at least the one that's on my Debian), adding alias 'cp -> cp -i' to compensate for the automatic overriding. Closes #384.
2014-07-15 15:22:54 +02:00
Florian Nücke
88710b7b95 Should fix render glitches in screen GUI for inaccurate texture samplers. 2014-07-14 22:19:56 +02:00
Florian Nücke
ae32a08b3c OCD! 2014-07-14 21:02:11 +02:00
Florian Nücke
d9d07f2ac2 Merge branch 'patch-3' of https://github.com/istasi/OpenComputers 2014-07-14 20:34:45 +02:00
Florian Nücke
92ff3892b5 Merge branch 'patch-2' of https://github.com/istasi/OpenComputers 2014-07-14 20:33:00 +02:00
Florian Nücke
96b947c913 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-14 20:26:02 +02:00
Florian Nücke
c1d5371738 Ugly workaround for IC2+Racks, closes #404. 2014-07-14 20:24:11 +02:00
istasi
bc080f3548 make openos perfer screens with keyboards attached. 2014-07-14 19:18:00 +02:00
istasi
1674dc537c Make boot loader prefer screens with keyboards attached 2014-07-14 19:15:47 +02:00
Florian Nücke
05a0211522 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-14 18:31:29 +02:00
Florian Nücke
9a3049ed84 Fixed the fix for getKeyboards(), gah. 2014-07-14 18:30:09 +02:00
Florian Nücke
30eec9b385 Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers 2014-07-14 18:00:16 +02:00
Florian Nücke
2cde13b7bd A little late, but a type alias for Icon and IconRegister to make porting items and blocks to 1.7 easier from here on out. 2014-07-14 17:19:30 +02:00
Florian Nücke
ae2d284996 Added setting to allow forcing use of old font renderer. 2014-07-14 15:20:21 +02:00
Florian Nücke
19d1edfbe7 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Conflicts:
	build.properties
2014-07-14 14:10:45 +02:00
Florian Nücke
e7d64fa6d0 Version bump. v1.3.1 2014-07-14 14:08:12 +02:00
Florian Nücke
99536f5217 Fixed text centering in robot GUI's screen. 2014-07-14 14:05:01 +02:00
Florian Nücke
f3b7b41b9f Merge branch 'patch-8' of https://github.com/Vexatos/OpenComputers 2014-07-14 13:43:44 +02:00
gamax92
de254def91 Reformat LuaJ
Rather sick of this inconstistent (and overly spaced) formatting
Even if it makes certain parts worse, having it all constistent will be
helpful.
2014-07-13 21:49:18 -06:00
gamax92
d070d5231c Various fixes 2014-07-13 21:14:37 -06:00
Florian Nücke
984123efdc Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-07-14 00:18:07 +02:00
Florian Nücke
70690110c2 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-14 00:17:43 +02:00
Florian Nücke
9cb9efd940 Merge pull request #399 from gamax92/LuaJSucks
Fix math.random in LuaJ.
2014-07-13 23:20:00 +02:00
Florian Nücke
0321a7816c Fixed math.random, closes #400. 2014-07-13 23:19:15 +02:00
gamax92
56221d04fd Use doubles instead of long 2014-07-13 12:20:21 -06:00
Vexatos
aeae1244f4 Update go.lua 2014-07-13 20:00:15 +02:00
gamax92
0d65552442 Fix math.random 2014-07-13 11:56:54 -06:00
Vexatos
f7603f9a8a Create go.lua 2014-07-13 19:29:25 +02:00
Florian Nücke
da5f2590aa Shuffling lib load order a bit to see if it avoids the arm lib being sorta-kinda loaded on non-arm Linux. 2014-07-12 23:04:15 +02:00
Florian Nücke
d84a899d4e Fix wide char loading in TextBuffer. 2014-07-12 20:53:11 +02:00
Florian Nücke
3ba9854c2e At least it's not breaking for normal stuff. 2014-07-12 18:38:07 +02:00
Florian Nücke
022becaea0 Little bit of refactoring, term.write is sorta kinda supporting wide chars now. 2014-07-12 17:06:08 +02:00
Florian Nücke
f348a8013e Making char width checks in unicode lib available to sandbox. 2014-07-12 14:30:36 +02:00
Florian Nücke
2bfd15ad2e Cleaning up a bit and getting rid of an unnecessary copy step. 2014-07-12 14:15:55 +02:00
Florian Nücke
1ef1c9ce00 Got the basics working. 2014-07-12 13:50:32 +02:00
Florian Nücke
f522f83781 Adding in @asiekierka's contributions of unifont and parser for #41. 2014-07-12 12:56:53 +02:00
Florian Nücke
c172462540 Forgotted to save colored floppy raws. 2014-07-12 03:23:52 +02:00
Florian Nücke
e6154c6ab7 Some preparatory changes for #41. 2014-07-12 03:06:51 +02:00
Florian Nücke
20a7c9c83f Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers 2014-07-11 23:29:45 +02:00
gamax92
bc46f8ca66 Add more precision support to format
Add precision support to e,E,f
Add alternateForm support for e,E,f,g,G
2014-07-11 14:54:29 -06:00
Florian Nücke
ed1611c28d Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers 2014-07-11 22:05:52 +02:00
gamax92
b22cfc4817 More formatting functionality
Allow e,E,f,g,G to handle plus,space,zeros,width but not precision
Allow d,i to use plus,space
2014-07-11 13:10:17 -06:00
gamax92
e31337050b Don't fall through 2014-07-11 12:03:43 -06:00
gamax92
2dded39ca4 Even more format fixes
Add width support to %c
2014-07-11 11:57:43 -06:00
gamax92
26bcd8ac29 Fix some more string.format
o,u,x,X does not respond to explicitPlus or space
implemented #
fixed "repeating flags" check
2014-07-11 11:32:30 -06:00
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