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

ae6970a5

Commit ae6970a5 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1021-400

See merge request pregmodfan/fc-pregmod!1597

parents 07934b64 c21e18f1

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

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

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

devNotes/twine JS
src/events/intro/initNationalities.tw 3 additions, 2 deletions

src/events/intro/initNationalities.tw
src/js/extendedFamilyModeJS.tw 22 additions, 0 deletions

src/js/extendedFamilyModeJS.tw
src/uncategorized/BackwardsCompatibility.tw 6 additions, 0 deletions

src/uncategorized/BackwardsCompatibility.tw
src/uncategorized/arcologyOpinion.tw 26 additions, 12 deletions

src/uncategorized/arcologyOpinion.tw
src/uncategorized/futureSocities.tw 3 additions, 0 deletions

src/uncategorized/futureSocities.tw
src/uncategorized/neighborDescription.tw 18 additions, 0 deletions

src/uncategorized/neighborDescription.tw
src/uncategorized/neighborInteract.tw 6 additions, 0 deletions

src/uncategorized/neighborInteract.tw
src/uncategorized/neighborsDevelopment.tw 62 additions, 0 deletions

src/uncategorized/neighborsDevelopment.tw
src/uncategorized/neighborsFSAdoption.tw 48 additions, 38 deletions

src/uncategorized/neighborsFSAdoption.tw
src/utility/slaveCreationWidgets.tw 15 additions, 0 deletions

src/utility/slaveCreationWidgets.tw

with 242 additions and 53 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