add custom block ticking, to work around bug in vanilla block ticking
Merge remote-tracking branch 'origin/master'