Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

d57cb1d7

Commit d57cb1d7 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #1681 and #1683

See merge request pregmodfan/fc-pregmod!6543

parents 814d02b9 8d1f2f4b

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/gameVariableData.js 1 addition, 1 deletion

js/003-data/gameVariableData.js
src/data/backwardsCompatibility/datatypeCleanup.js 5 additions, 1 deletion

src/data/backwardsCompatibility/datatypeCleanup.js
src/descriptions/familySummaries.js 2 additions, 2 deletions

src/descriptions/familySummaries.js
src/endWeek/saWhore.js 3 additions, 3 deletions

src/endWeek/saWhore.js
src/endWeek/saWorkTheFarm.js 16 additions, 14 deletions

src/endWeek/saWorkTheFarm.js
src/js/economyJS.js 5 additions, 5 deletions

src/js/economyJS.js
src/js/food.js 36 additions, 40 deletions

src/js/food.js
src/uncategorized/brothel.tw 1 addition, 1 deletion

src/uncategorized/brothel.tw
src/uncategorized/slaveAssignmentsReport.tw 5 additions, 5 deletions

src/uncategorized/slaveAssignmentsReport.tw
src/utility/extendedFamilyWidgets.tw 1 addition, 1 deletion

src/utility/extendedFamilyWidgets.tw

with 75 additions and 73 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