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

b57d1d8b

Commit b57d1d8b authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1021-94

See merge request pregmodfan/fc-pregmod!924

parents acd7260d 3ab36cdc

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/gui/Encyclopedia/encyclopedia.tw 2 additions, 1 deletion

src/gui/Encyclopedia/encyclopedia.tw
src/pregmod/eliteTakeOver.tw 8 additions, 8 deletions

src/pregmod/eliteTakeOver.tw
src/pregmod/eliteTakeOverFight.tw 0 additions, 0 deletions

src/pregmod/eliteTakeOverFight.tw
src/pregmod/eliteTakeOverResult.tw 0 additions, 0 deletions

src/pregmod/eliteTakeOverResult.tw
src/pregmod/widgets/slaveTradePresetWidgets.tw 389 additions, 14 deletions

src/pregmod/widgets/slaveTradePresetWidgets.tw
src/uncategorized/longSlaveDescription.tw 8 additions, 1 deletion

src/uncategorized/longSlaveDescription.tw
src/uncategorized/nextWeek.tw 1 addition, 1 deletion

src/uncategorized/nextWeek.tw
src/uncategorized/pRivalInitiation.tw 1 addition, 1 deletion

src/uncategorized/pRivalInitiation.tw
src/uncategorized/saLongTermEffects.tw 1 addition, 1 deletion

src/uncategorized/saLongTermEffects.tw
src/utility/descriptionWidgetsFlesh.tw 3 additions, 8 deletions

src/utility/descriptionWidgetsFlesh.tw
src/utility/descriptionWidgetsStyle.tw 4 additions, 4 deletions

src/utility/descriptionWidgetsStyle.tw
src/utility/slaveCreationWidgets.tw 1 addition, 1 deletion

src/utility/slaveCreationWidgets.tw

with 418 additions and 40 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