Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

552ec594

Commit 552ec594 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

parents aecf1d3f 9ae84288

No related branches found

No related tags found

1 merge request!1621Moving widget and minor JS fix.

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/events/intro/initNationalities.tw 359 additions, 359 deletions

src/events/intro/initNationalities.tw
src/events/intro/introSummary.tw 4 additions, 4 deletions

src/events/intro/introSummary.tw
src/init/setupVars.tw 176 additions, 179 deletions

src/init/setupVars.tw
src/js/utilJS.tw 37 additions, 1 deletion

src/js/utilJS.tw
src/npc/startingGirls/startingGirls.tw 1 addition, 1 deletion

src/npc/startingGirls/startingGirls.tw
src/pregmod/basenationalitiesControls.tw 23 additions, 23 deletions

src/pregmod/basenationalitiesControls.tw
src/pregmod/customizeSlaveTrade.tw 3 additions, 5 deletions

src/pregmod/customizeSlaveTrade.tw
src/pregmod/widgets/pregmodWidgets.tw 3 additions, 3 deletions

src/pregmod/widgets/pregmodWidgets.tw
src/pregmod/widgets/slaveTradePresetWidgets.tw 26 additions, 26 deletions

src/pregmod/widgets/slaveTradePresetWidgets.tw
src/uncategorized/generateXXSlave.tw 2 additions, 2 deletions

src/uncategorized/generateXXSlave.tw
src/uncategorized/generateXYSlave.tw 2 additions, 2 deletions

src/uncategorized/generateXYSlave.tw
src/uncategorized/slaveGenerationWidgets.tw 1 addition, 1 deletion

src/uncategorized/slaveGenerationWidgets.tw

with 637 additions and 606 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment