Fix for Marble's infinite morning milk
Fix for probable Isabella timeChange problem
Fix for probable timeChange problem
Fixed probable timeChange problem
Merge pull request #631 from IndirectOne/master

This should fix the problems caused by allowing more than one major event per hour