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

adbab74c

Commit adbab74c authored 6 years ago by Pregmodder

Downloads
- Plain Diff

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

manual merge of farmyard

See merge request !2543

parents 94833e77 f85747e1

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

devNotes/twine JS.txt 4 additions, 0 deletions

devNotes/twine JS.txt
src/gui/Encyclopedia/encyclopedia.tw 7 additions, 3 deletions

src/gui/Encyclopedia/encyclopedia.tw
src/init/storyInit.tw 3 additions, 1 deletion

src/init/storyInit.tw
src/js/economyJS.tw 4 additions, 0 deletions

src/js/economyJS.tw
src/pregmod/beastFucked.tw 415 additions, 362 deletions

src/pregmod/beastFucked.tw
src/pregmod/farmyard.tw 37 additions, 9 deletions

src/pregmod/farmyard.tw
src/uncategorized/BackwardsCompatibility.tw 11 additions, 2 deletions

src/uncategorized/BackwardsCompatibility.tw
src/uncategorized/buildingWidgets.tw 1 addition, 1 deletion

src/uncategorized/buildingWidgets.tw
src/uncategorized/costsReport.tw 4 additions, 0 deletions

src/uncategorized/costsReport.tw
src/uncategorized/main.tw 3 additions, 1 deletion

src/uncategorized/main.tw
src/uncategorized/manufacturing.tw 2 additions, 2 deletions

src/uncategorized/manufacturing.tw
src/uncategorized/slaveInteract.tw 5 additions, 3 deletions

src/uncategorized/slaveInteract.tw

with 496 additions and 384 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