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

1812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
11592e6b72 Minor refactoring. 2014-07-17 14:43:22 +02:00
Florian Nücke
14ff4ce9d4 Added visual indicator for disks in disk drives (they 'stand out' a bit now). 2014-07-16 21:27:09 +02:00
Florian Nücke
9964575414 Localized strings for switch GUI. 2014-07-16 18:38:01 +02:00
Florian Nücke
7149eeabc4 Fixed robots bouncing back network messages. 2014-07-16 18:05:18 +02:00
Florian Nücke
8cc4232424 Generified inventory name stuffs, will make this less conflict-prone with MC1.7 in the future. 2014-07-16 17:55:47 +02:00
Florian Nücke
4f289cd15f Getting rid of a crapton of redundant code. BEWARE: resulted in most textures being renamed! 2014-07-16 17:43:09 +02:00
Florian Nücke
07edd561c4 Pet rendering fixes. 2014-07-16 14:13:09 +02:00
Florian Nücke
021a0bcd08 Synchronizing values for open switch GUI. 
Properly restoring upgraded values when loading.
 2014-07-15 18:59:16 +02:00
Florian Nücke
33a8f56d57 Added third upgrade type for switches (for packets / send cycle), using RAM for that, hard drives for queue size. 
Some more GUI ground work.
 2014-07-15 17:48:52 +02:00
Florian Nücke
8f572d2b6b Also updated localization keys from 'router' to 'switch'/'access point'. 2014-07-15 16:37:01 +02:00
Florian Nücke
828213ceb7 Some refactoring to get rid of the use of 'router' instead of 'switch' for consistency. 2014-07-15 16:24:40 +02:00
Florian Nücke
d4618e6d6d Merge branch 'master' of https://github.com/Kilobyte22/OpenComputers into switch-upgrades 2014-07-15 16:16:10 +02:00
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