DeConflict

devNotes/VersionChangeLog-Premod+LoliMod.txt

src/Mods/DinnerParty/dinnerPartyExecution.tw

src/Mods/DinnerParty/dinnerPartyPreparations.tw

src/SecExp/secExpSmilingMan.tw

src/SpecialForce/TrickShotNight.tw

src/js/PenthouseNaming.js

src/js/optionsMacro.js

src/js/pregJS.js

src/js/quickListJS.js

src/js/rbuttonJS.js

src/js/relationshipChecks.js

src/js/rulesAssistant.js

src/js/rulesAssistantOptions.js

src/js/slaveStatsChecker.js

src/js/slaveSummaryWidgets.js

src/npc/acquisition.tw

src/pregmod/eliteSlave.tw

src/pregmod/eliteTakeOverResult.tw

src/pregmod/pRaped.tw

src/pregmod/seFCTVshows.tw