Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

.gitlab-ci.yml

CHANGELOG.md

css/general/textColors.css

css/rulesAssistant/conditionEditor.css

devTools/types/FC/desc.d.ts

devTools/types/FC/facilities.d.ts

devTools/types/FC/financial.d.ts

devTools/types/FC/gameState.d.ts

devTools/types/FC/misc.d.ts

devTools/types/SugarCubeExtensions.d.ts

js/003-data/gameVariableData.js

js/003-data/miscDataNames.js

js/003-data/slaveMods.js

js/rulesAssistant/conditionEditor.js

js/rulesAssistant/conditionEvaluation.js

src/002-config/fc-version.js

src/004-base/facility.js

src/004-base/facilityFramework.js

src/Mods/Catmod/events/reRecruit/runawayCat.js

src/Mods/Catmod/events/scheduled/vatcatboy.js