Update ls.lua
Update ls.lua
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?
Using MC resource provider to get Unifont to allow changing it in resource packs (and code for re-generating char lookup texture accordingly).
Fixed the tablet test item and enabled for now to allow people testing it (can't be crafted though, it's for testing only).
Tracking uptime manually (not via delta to timestarted based on world time). Closes #419.
Merge branch 'patch-9' of https://github.com/istasi/OpenComputers
Fixed term.write for strings with tabs (snuck in with wide char stuff).
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
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
Adjusted backport of Mekanism support for 1.6.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/api/java/mekanism/api/energy/ICableOutputter.java
	src/api/java/mekanism/api/energy/IEnergizedItem.java
	src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
	src/main/scala/li/cil/oc/util/mods/Mods.scala
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.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
Adjustments for 1.7.