Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

This commit is contained in:
Florian Nücke 2014-03-23 12:15:07 +01:00
commit f29eed393e

View File

@ -21,7 +21,7 @@ class CompositeReadOnlyFileSystem(factories: mutable.LinkedHashMap[String, Calla
override def isReadOnly = true
override def spaceTotal = parts.values.map(_.spaceTotal).sum
override def spaceTotal = math.max(spaceUsed, parts.values.map(_.spaceTotal).sum)
override def spaceUsed = parts.values.map(_.spaceUsed).sum