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

a23a67b6

Commit a23a67b6 authored 4 years ago by svornost

Downloads
- Plain Diff

Merge branch 'pregmod-master' of ssh.gitgud.io:pregmodfan/fc-pregmod into pregmod-master

parents 2548da0a 3da9a3f7

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

devTools/checkJS.sh 14 additions, 0 deletions

devTools/checkJS.sh
devTools/makeTwineJSPassage.sh 1 addition, 1 deletion

devTools/makeTwineJSPassage.sh
src/004-base/facility.js 2 additions, 0 deletions

src/004-base/facility.js
src/arcologyBuilding/base.js 7 additions, 7 deletions

src/arcologyBuilding/base.js
src/arcologyBuilding/manufacturing.js 1 addition, 2 deletions

src/arcologyBuilding/manufacturing.js
src/arcologyBuilding/markets.js 4 additions, 10 deletions

src/arcologyBuilding/markets.js
src/arcologyBuilding/penthouse.js 18 additions, 40 deletions

src/arcologyBuilding/penthouse.js
src/data/backwardsCompatibility/backwardsCompatibility.js 7 additions, 5 deletions

src/data/backwardsCompatibility/backwardsCompatibility.js
src/data/backwardsCompatibility/datatypeCleanup.js 12 additions, 12 deletions

src/data/backwardsCompatibility/datatypeCleanup.js
src/facilities/armory/armoryFramework.js 1 addition, 1 deletion

src/facilities/armory/armoryFramework.js
src/gui/quicklinks.js 21 additions, 16 deletions

src/gui/quicklinks.js

with 88 additions and 94 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