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

380e4f85

Commit 380e4f85 authored 5 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'arc' into 'pregmod-master'

Multiple different arcology upgrades

See merge request pregmodfan/fc-pregmod!6480

parents 7229d53d e188ae37

Branches

Tags

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

js/utils.js 0 additions, 2 deletions

js/utils.js
src/002-config/Serializable.js 1 addition, 1 deletion

src/002-config/Serializable.js
src/arcologyBuilding/base.js 22 additions, 9 deletions

src/arcologyBuilding/base.js
src/arcologyBuilding/presets.js 102 additions, 31 deletions

src/arcologyBuilding/presets.js
src/data/backwardsCompatibility/backwardsCompatibility.js 5 additions, 0 deletions

src/data/backwardsCompatibility/backwardsCompatibility.js
src/uncategorized/manageArcology.tw 2 additions, 6 deletions

src/uncategorized/manageArcology.tw

with 132 additions and 49 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