-added data collection support for diamond collection times
Merge branch 'master' of https://github.com/vinicz/potential-octo-adventure