Merge branch 'master' into build

github-actions[bot] · github-actions[bot] · commit 7547e1f4276a · 2022-02-24T20:03:29.000Z
diff --git a/README.md b/README.md
@@ -64,4 +64,4 @@ If not obvious, you must be logged into/authorised with Twitch in the `nodecg-sp
 
 Commercials will automatically be triggered when needed, including when switched to the non-run commercial trigger scene in OBS, by default the scene must start with "Intermission (commercials)" but this can be changed in the configuration file (see above).
 
-There is also a dashboard button to disable running commercials for the rest of a run, useful if the run is planned to go highly under estimate.
+There is also a dashboard button to disable running commercials for the rest of a run, useful if the run is planned to go highly under estimate, and a dashboard toggle to disable the actual commercial "running" logic; all other logic will still actually happen, but no commercials will be triggered, useful for testing.

Original file line number	Diff line number	Diff line change
@@ -64,4 +64,4 @@ If not obvious, you must be logged into/authorised with Twitch in the `nodecg-sp
`64`	`64`
`65`	`65`	`Commercials will automatically be triggered when needed, including when switched to the non-run commercial trigger scene in OBS, by default the scene must start with "Intermission (commercials)" but this can be changed in the configuration file (see above).`
`66`	`66`
`67`		`-There is also a dashboard button to disable running commercials for the rest of a run, useful if the run is planned to go highly under estimate.`
	`67`	`+There is also a dashboard button to disable running commercials for the rest of a run, useful if the run is planned to go highly under estimate, and a dashboard toggle to disable the actual commercial "running" logic; all other logic will still actually happen, but no commercials will be triggered, useful for testing.`