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

9998c599

Commit 9998c599 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'more-arcmgmt' into 'pregmod-master'

More arcmgmt

See merge request !8141

parents 187c832b 25738a79

Branches

Tags

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/miscData.js 13 additions, 2 deletions

js/003-data/miscData.js
src/endWeek/economics/arcmgmt.js 38 additions, 315 deletions

src/endWeek/economics/arcmgmt.js
src/endWeek/endWeek.js 1 addition, 1 deletion

src/endWeek/endWeek.js
src/js/utilsFC.js 2 additions, 2 deletions

src/js/utilsFC.js
src/markets/bulkSlave/bulkSlaveIntro.js 2 additions, 2 deletions

src/markets/bulkSlave/bulkSlaveIntro.js
src/markets/marketUI.js 1 addition, 1 deletion

src/markets/marketUI.js
src/markets/theMarket/buySlaves.js 1 addition, 1 deletion

src/markets/theMarket/buySlaves.js

with 58 additions and 324 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