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

9a5d299c

Commit 9a5d299c authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1022-52

See merge request !1850

parents f9743599 5ecd4221

No related branches found

No related tags found

2 merge requests!2047RA rework,!1850Pregmod v1022-52

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/events/intro/introSummary.tw 2 additions, 1 deletion

src/events/intro/introSummary.tw
src/gui/Encyclopedia/encyclopedia.tw 4 additions, 3 deletions

src/gui/Encyclopedia/encyclopedia.tw
src/js/artColorToolsJS.tw 2 additions, 0 deletions

src/js/artColorToolsJS.tw
src/js/vectorRevampedArtControlJS.tw 1 addition, 0 deletions

src/js/vectorRevampedArtControlJS.tw
src/pregmod/electiveSurgery.tw 3 additions, 0 deletions

src/pregmod/electiveSurgery.tw
src/pregmod/pcAppearanceIntro.tw 4 additions, 0 deletions

src/pregmod/pcAppearanceIntro.tw
src/pregmod/widgets/pregmodWidgets.tw 2 additions, 2 deletions

src/pregmod/widgets/pregmodWidgets.tw
src/pregmod/widgets/slaveSummaryWidgets.tw 10 additions, 2 deletions

src/pregmod/widgets/slaveSummaryWidgets.tw
src/uncategorized/customSlave.tw 4 additions, 0 deletions

src/uncategorized/customSlave.tw
src/uncategorized/prestigiousSlave.tw 2 additions, 2 deletions

src/uncategorized/prestigiousSlave.tw

with 34 additions and 10 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