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

7cc6595e

Commit 7cc6595e authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1021-266

See merge request pregmodfan/fc-pregmod!1307

parents acce20b6 cf3ec18b

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

devNotes/VersionChangeLog-Premod+LoliMod.txt 8 additions, 0 deletions

devNotes/VersionChangeLog-Premod+LoliMod.txt
devNotes/twine JS 1840 additions, 1 deletion

devNotes/twine JS
src/init/setupVars.tw 1 addition, 1 deletion

src/init/setupVars.tw
src/js/economyJS.tw 1 addition, 1 deletion

src/js/economyJS.tw
src/js/eventSelectionJS.tw 1838 additions, 0 deletions

src/js/eventSelectionJS.tw
src/uncategorized/RESS.tw 2 additions, 0 deletions

src/uncategorized/RESS.tw
src/uncategorized/masterSuite.tw 3 additions, 0 deletions

src/uncategorized/masterSuite.tw
src/uncategorized/newSlaveIntro.tw 1 addition, 1 deletion

src/uncategorized/newSlaveIntro.tw
src/uncategorized/policies.tw 3 additions, 4 deletions

src/uncategorized/policies.tw
src/uncategorized/randomIndividualEvent.tw 15 additions, 1865 deletions

src/uncategorized/randomIndividualEvent.tw
src/utility/descriptionWidgetsFlesh.tw 11 additions, 11 deletions

src/utility/descriptionWidgetsFlesh.tw

with 3723 additions and 1884 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