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

641e737d

Commit 641e737d authored 5 years ago by Pregmodder

Downloads
- Plain Diff

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

fixes + work

See merge request pregmodfan/fc-pregmod!4815

parents f67cbfb4 b918e8c8

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/gui/Encyclopedia/encyclopedia.tw 1 addition, 0 deletions

src/gui/Encyclopedia/encyclopedia.tw
src/npc/fDance.tw 12 additions, 14 deletions

src/npc/fDance.tw
src/uncategorized/randomIndividualEvent.tw 1 addition, 1 deletion

src/uncategorized/randomIndividualEvent.tw
src/uncategorized/slaveInteract.tw 2 additions, 4 deletions

src/uncategorized/slaveInteract.tw

with 16 additions and 19 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