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

30112f98

Commit 30112f98 authored 3 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 975af38b 65081044

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

css/general/formatting.css 3 additions, 2 deletions

css/general/formatting.css
css/general/textColors.css 1 addition, 1 deletion

css/general/textColors.css
css/gui/encyclopedia.css 8 additions, 0 deletions

css/gui/encyclopedia.css
src/004-base/encyclopediaMap.js 17 additions, 0 deletions

src/004-base/encyclopediaMap.js
src/facilities/headGirlSuite/headGirlSuite.js 9 additions, 7 deletions

src/facilities/headGirlSuite/headGirlSuite.js
src/gui/Encyclopedia/encyclopedia.tw 0 additions, 159 deletions

src/gui/Encyclopedia/encyclopedia.tw
src/gui/Encyclopedia/encyclopediaRelatedLinks.tw 0 additions, 16 deletions

src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
src/gui/Encyclopedia/encyclopediaSlaves.js 391 additions, 0 deletions

src/gui/Encyclopedia/encyclopediaSlaves.js

with 429 additions and 185 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