Merge remote-tracking branch 'MikE41/patch-1' into no-time-mod

* MikE41/patch-1:
  Update hockey.luac
Use pretty names, and only show actual game streams
Merge branch 'no-time-mod' into no-time-mod-pre-2.1

* no-time-mod:
  Use pretty names, and only show actual game streams

Conflicts:
	hockey.luac