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

495206f1

Commit 495206f1 authored 6 years ago by Jones

Downloads
- Plain Diff

Merge branch 'pregmod-master' into Population

# Conflicts:
#	src/uncategorized/BackwardsCompatibility.tw

parents cce01a9d 4e9186b8

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

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

devNotes/VersionChangeLog-Premod+LoliMod.txt
devNotes/twine JS.txt 66 additions, 0 deletions

devNotes/twine JS.txt
src/cheats/mod_EditArcologyCheat.tw 30 additions, 17 deletions

src/cheats/mod_EditArcologyCheat.tw
src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw 1 addition, 37 deletions

src/cheats/mod_EditArcologyCheatDatatypeCleanup.tw
src/events/intro/introSummary.tw 3 additions, 3 deletions

src/events/intro/introSummary.tw
src/js/datatypeCleanupJS.tw 66 additions, 0 deletions

src/js/datatypeCleanupJS.tw
src/pregmod/theBlackMarket.tw 1 addition, 1 deletion

src/pregmod/theBlackMarket.tw
src/uncategorized/BackwardsCompatibility.tw 2 additions, 57 deletions

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

src/uncategorized/RESS.tw
src/uncategorized/RETS.tw 10 additions, 5 deletions

src/uncategorized/RETS.tw
src/uncategorized/costsReport.tw 1 addition, 1 deletion

src/uncategorized/costsReport.tw
src/uncategorized/persBusiness.tw 17 additions, 30 deletions

src/uncategorized/persBusiness.tw

with 207 additions and 152 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