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

Makefile

compile.sh

compile_debug+sanityCheck.bat

compile_debug+sanityCheck_legacy.bat

devTools/check.py

devTools/concatFiles.sh

devTools/makeTwineCSSPassage.sh

devTools/makeTwineJSPassage.sh

sanityCheck.sh

src/Mods/SpecialForce/SpecialForce.js

src/Mods/SpecialForce/TrickShotNight.tw

src/Mods/SpecialForce/WeeklyChoices.tw

src/SecExp/js/secExp.js

src/cheats/mod_EditSlaveCheatDatatypeCleanupNew.tw

src/data/backwardsCompatibility/updateSlaveObject.js

src/endWeek/saGetMilked.js

src/endWeek/saPorn.js

src/endWeek/saStayConfined.js

src/endWeek/saTakeClasses.js

src/facilities/farmyard/farmyard.tw