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

43d2bcc4

Commit 43d2bcc4 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

parents d6dbf2a1 108fcdce

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

js/002-config/fc-js-init.js 1 addition, 0 deletions

js/002-config/fc-js-init.js
src/facilities/nursery/utils/nurseryUtils.js 1 addition, 1 deletion

src/facilities/nursery/utils/nurseryUtils.js
src/markets/specialSlave.js 115 additions, 0 deletions

src/markets/specialSlave.js
src/markets/specialSlave.tw 5 additions, 0 deletions

src/markets/specialSlave.tw
src/npc/descriptions/name.js 1 addition, 2 deletions

src/npc/descriptions/name.js
src/npc/generate/heroCreator.js 0 additions, 5 deletions

src/npc/generate/heroCreator.js
src/uncategorized/completeCatalog.js 0 additions, 65 deletions

src/uncategorized/completeCatalog.js
src/uncategorized/completeCatalog.tw 0 additions, 5 deletions

src/uncategorized/completeCatalog.tw
src/uncategorized/specialSlave.tw 0 additions, 36 deletions

src/uncategorized/specialSlave.tw

with 123 additions and 114 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