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

fca71763

Commit fca71763 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'farmyard-dev' into 'pregmod-master'

Farmyard Cleanup and Changes

See merge request !6875

parents 0ab42baf c5797d19

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/endWeek/saWorkTheFarm.js 21 additions, 69 deletions

src/endWeek/saWorkTheFarm.js
src/facilities/farmyard/farmyardReport.tw 1 addition, 347 deletions

src/facilities/farmyard/farmyardReport.tw
src/facilities/farmyard/reports/farmyardReport.js 5 additions, 5 deletions

src/facilities/farmyard/reports/farmyardReport.js
src/gui/Encyclopedia/encyclopediaEntries.js 1 addition, 1 deletion

src/gui/Encyclopedia/encyclopediaEntries.js
src/interaction/slaveInteract.js 1 addition, 1 deletion

src/interaction/slaveInteract.js
src/js/food.js 2 additions, 2 deletions

src/js/food.js
src/js/vignettes.js 1 addition, 1 deletion

src/js/vignettes.js

with 32 additions and 426 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