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

2f399f76

Commit 2f399f76 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 096a5743 20b80602

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/npc/descriptions/accent.js 4 additions, 1 deletion

src/npc/descriptions/accent.js
src/npc/descriptions/describePiercings.js 2 additions, 19 deletions

src/npc/descriptions/describePiercings.js
src/npc/descriptions/mouth.js 12 additions, 0 deletions

src/npc/descriptions/mouth.js
src/npc/descriptions/name.js 2 additions, 1 deletion

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

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

src/uncategorized/completeCatalog.js
src/uncategorized/completeCatalog.tw 1 addition, 30 deletions

src/uncategorized/completeCatalog.tw

with 91 additions and 51 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