Merge branch 'pregmod-master' into 'pregmod-master'

Put back $nextButton and $nextLink setters in main.tw because they get tested indirectly

Closes #1737

See merge request !6666

src/uncategorized/main.tw

@@ -15,7 +15,7 @@
 
 <<run penthouseCensus()>>
 
-<<set $showEncyclopedia = 1, $encyclopedia = "How to Play">>
+<<set $nextButton = "END WEEK", $nextLink = "End Week", $showEncyclopedia = 1, $encyclopedia = "How to Play">>
 <<set $costs = Math.trunc(calculateCosts.predict())>>
 
 <<set $currentRule = $defaultRules[0]>>