Corrected documentation on MethodWhitelist (it goes into environments, not drivers).
Deprecated NamedBlock going into drivers, it should go into environments now (it being in drivers will no longer be supported in OC 1.3).
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
Added hologram.copy, which is slightly more efficient than hologram.fill'ing the same area (for larger areas anyway).
Fixed something that wasn't really a bug since it would have happened for illegal arguments anyway.
Added tier 1.5 RAM. So many files touched, so little changed.
Using RAM T1.5 for robots' built-in ram sizes.
Fixed bug in resolution.lua when setting to currently set resolution.
Allowing h x w resolutions as long as h <= maxWidth and the overall area is <= maxWidth * maxHeight.
Fixed memory slot checks.
Added creative tier case with all max-tier slots, closes #171. This case also generates an infinite amount of energy.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/util/ItemCosts.scala
Fixed a bug in man.lua when help topic wasn't found.
Moved dig.lua to a loot disk.
Added loot disks to creative tab. Won't show in NEI, just classic creative tab, but I'm OK with that.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
Added a setting whether /tmp should be erased on *soft* reboots (computer.shutdown(true)).
Beware: defaults to *false*, which is different from what it was up to now.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
Fixed the navigation upgrade forgetting its position.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7
cleanup
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7