Florian Nücke
b72060d7a8
Removed some more stuff from LuaJ kernel sandbox that's not needed.
2014-07-23 21:12:55 +02:00
Florian Nücke
5cf5a62316
Prep texture work for #393 .
2014-07-23 20:58:11 +02:00
Florian Nücke
b94dbbeb9c
Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers
2014-07-23 17:54:09 +02:00
gamax92
7331f42b0b
Fix collectgarbage
...
Converted String switch case to if statements
2014-07-23 09:43:27 -06:00
Florian Nücke
c3c059558e
Added creative tier servers, closes #394 .
2014-07-23 17:14:52 +02:00
Florian Nücke
4c9fafcfb0
Merge branch 'istasi-patch-8'
2014-07-23 14:22:10 +02:00
Florian Nücke
530f0ca18f
Formatting df.lua, added --si.
2014-07-23 14:21:37 +02:00
Florian Nücke
ca4e285511
Merge branch 'patch-8' of https://github.com/istasi/OpenComputers into istasi-patch-8
2014-07-23 13:59:14 +02:00
Florian Nücke
52006b3bfd
Should fix NPE in tablets, closes #427 .
2014-07-23 13:56:32 +02:00
Florian Nücke
6bf9423f35
Added IM support for Keyboards, closes #247 . Sorry, cba to fiddle in FMP support for these.
2014-07-23 08:09:34 +02:00
Florian Nücke
63bdcad60b
Added a bunch of missing Callback doc strings (gpu and fs).
...
Exposing component.methods to user programs (so you don't need a proxy to list methods on components).
2014-07-23 07:57:16 +02:00
gamax92
739852e811
Fix collectgarbage
...
Default is now collect, all options are now listed, and error message
changed.
2014-07-22 12:14:53 -06:00
Florian Nücke
3dee113325
Added option to server racks to control how they act as switches (internal or external).
...
External is the 'old' mode, internal will only relay messages to the side a server is connected to and other servers in the rack. This can be used to make servers act as network filters more easily (with one server per connected network).
Also might have fixed some derpery in how messages are relayed in general.
2014-07-22 18:33:45 +02:00
Florian Nücke
b718f22c9c
Added an HDD to tablet for testing.
2014-07-22 16:48:27 +02:00
istasi
dea42d852c
Update df.lua
...
-h for human readable, will show KB and MB
2014-07-22 16:32:14 +02:00
Florian Nücke
56be86f17e
Possibly fixing some minor potential crashes.
2014-07-22 14:30:55 +02:00
gamax92
ef7b8f7f60
Fix error in OsLib
...
give the letter not the ascii code
2014-07-22 00:27:32 -06:00
gamax92
ed25c4ff5e
Add a check to WeakTable
...
This is probably wrong, but what debugging and results show this fixes
LuaJ crashing on boot and randomly breaking
2014-07-22 00:20:21 -06:00
Florian Nücke
0e238fdb9f
Fixed unmounting. I think. Herpdiderp.
2014-07-22 03:22:03 +02:00
Florian Nücke
c542d4462d
Crapload of getWorldTime->getTotalWorldTime to avoid stuff breaking when doDaylightCycle false.
2014-07-21 23:01:29 +02:00
Florian Nücke
8843534c44
Should fix an NPE introduced by save dir cleanup.
2014-07-21 22:38:34 +02:00
Florian Nücke
4e0af14764
Fixed clipboard pasting in readonly files in edit.
...
Fixed crash for too large clipboard - was slightly too optimistic there. Now explicitly forbidding > 64k messages and splitting smaller ones int 16k packets just to be safe.
2014-07-21 22:27:21 +02:00
Florian Nücke
89afea6a07
Cleaning up empty file system folders when in unbuffered mode to avoid cluttering the save folder.
2014-07-21 21:10:47 +02:00
Florian Nücke
253c8f0c2b
Updated wiki url in readme.
2014-07-21 20:56:50 +02:00
Florian Nücke
5683d61435
Fixed derp in gpu.set introduced with wide char checks (aka 'index out of bounds of doom').
2014-07-21 20:36:14 +02:00
Florian Nücke
3916a6a6ae
Fixed / adjusted behavior of unicode.wlen to not derp things (i.e. don't use -1 length for control chars like \n).
...
Some formatting and tweaks in ls.lua.
2014-07-21 18:50:31 +02:00
Florian Nücke
a3c7653558
Adjusted backport of Mekanism support for 1.6.
2014-07-21 18:37:05 +02:00
Florian Nücke
d362b5015c
Added Mekanism to power converter tooltip and power mod availability check.
...
Minor refactoring of variable names.
Conflicts:
src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
2014-07-21 18:19:06 +02:00
Florian Nücke
c5cd53b76a
Added Mekanism API and supporting its power system directly.
...
Conflicts:
src/main/scala/li/cil/oc/Settings.scala
src/main/scala/li/cil/oc/util/mods/Mods.scala
2014-07-21 18:17:39 +02:00
Florian Nücke
718b81cbd6
Fixed term.write for strings with tabs (snuck in with wide char stuff).
2014-07-21 17:53:17 +02:00
Florian Nücke
e4592dfec9
Merge branch 'patch-9' of https://github.com/istasi/OpenComputers
2014-07-21 17:31:43 +02:00
Florian Nücke
32b9044eb4
Tracking uptime manually (not via delta to timestarted based on world time). Closes #419 .
2014-07-21 17:10:17 +02:00
Florian Nücke
0821aaba86
Fixed the tablet test item and enabled for now to allow people testing it (can't be crafted though, it's for testing only).
2014-07-21 16:42:03 +02:00
Florian Nücke
2f46c07ed5
Using MC resource provider to get Unifont to allow changing it in resource packs (and code for re-generating char lookup texture accordingly).
2014-07-21 14:36:50 +02:00
Florian Nücke
48516beebd
Fixed a typo in irc.lua and tracking own nickname (on nick changes) and displaying own name instead of 'me' and 'You' for messages/actions.
2014-07-21 13:28:51 +02:00
Florian Nücke
5e38060da5
Merge branch 'master' of https://github.com/PixelToast/OpenComputers
2014-07-21 13:04:31 +02:00
Florian Nücke
9e758608da
Organize imports.
2014-07-21 12:35:55 +02:00
PixelToast
88754eafe7
Update irc.lua
2014-07-20 21:00:02 -04:00
Florian Nücke
633ca1cee1
Finally took the time to make cables use the ISBRH instead of a TESR.
2014-07-21 02:02:12 +02:00
Florian Nücke
52918b5bcc
Fixed scaling of text in robot screens when using custom (lower) resolutions.
2014-07-20 21:35:38 +02:00
Florian Nücke
0c6d509227
Made robots have the same res as t1 screens since that fits into the GUI, now. Fewer special cases \o/
2014-07-20 21:28:06 +02:00
Florian Nücke
cb0e51efbb
Properly erroring for invalid indexes in gpu.get now and (probably?) fixing a bug in term.isWide.
2014-07-20 19:02:33 +02:00
istasi
4f874712c5
Update ls.lua
...
Changed so newlines only are inserted if io.output() == io.stdout and component.gpu isn't nil, or enough files to reach math.huge
it still formats width between file entries based on max length though, regardless of whenever there's an gpu or not though...
Though in which case would ls ever be used where there's no gpu?, and in said case, why not just use filesystem.list directly?
2014-07-20 18:30:06 +02:00
istasi
106e2fd197
Update df.lua
2014-07-20 18:17:59 +02:00
Florian Nücke
ef9506fd82
Meh.
2014-07-20 17:34:45 +02:00
Florian Nücke
78957853ef
Adjusted robot GUI for new font renderer's char aspect ratio (auto-sizes now).
...
Extracted the commonly used progress bar code into a common class.
2014-07-20 17:22:25 +02:00
Florian Nücke
114b232e9a
Fixed texture names.
2014-07-19 22:44:20 +02:00
Florian Nücke
9009c73398
Fixes that don't fix anything.
2014-07-19 22:35:57 +02:00
Florian Nücke
72e47bc7c2
Mod ids as constants instead of strings all over the place.
2014-07-19 17:42:14 +02:00
Florian Nücke
672d9d6b83
Merge branch 'master' of github.com:MightyPirates/OpenComputers
2014-07-19 13:58:29 +02:00
