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

75cc01f2

Commit 75cc01f2 authored 3 years ago by DCoded

Downloads
- Plain Diff

Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into hotfixes

parents 837bd460 289f2d57

No related branches found

No related tags found

2 merge requests!9518Fix,!9379descriptionWidgets text color fixes

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

devTools/javaSanityCheck/ignoredVariables 0 additions, 2 deletions

devTools/javaSanityCheck/ignoredVariables
src/Mods/SecExp/events/attackHandler.tw 0 additions, 0 deletions

src/Mods/SecExp/events/attackHandler.tw
src/Mods/SecExp/events/rebellionHandler.tw 0 additions, 0 deletions

src/Mods/SecExp/events/rebellionHandler.tw
src/Mods/SecExp/events/rebellionOptions.tw 0 additions, 0 deletions

src/Mods/SecExp/events/rebellionOptions.tw
src/Mods/SecExp/js/secExp.js 5 additions, 1 deletion

src/Mods/SecExp/js/secExp.js
src/Mods/SecExp/potentialToDo.txt 0 additions, 1 deletion

src/Mods/SecExp/potentialToDo.txt
src/events/nonRandom/daughters/pCoupAttempt.tw 15 additions, 4 deletions

src/events/nonRandom/daughters/pCoupAttempt.tw

with 20 additions and 8 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