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

6301587e

Commit 6301587e authored 2 years ago by Pregmodder

Downloads
- Plain Diff

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

Fixes

Closes #4269 and #4266

See merge request !11056

parents ab7ca1af 83f55c62

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/data/backwardsCompatibility/datatypeCleanup.js 3 additions, 0 deletions

src/data/backwardsCompatibility/datatypeCleanup.js
src/endWeek/economics/neighborsDevelopment.js 2 additions, 14 deletions

src/endWeek/economics/neighborsDevelopment.js
src/events/scheduled/assholeKnight.js 2 additions, 1 deletion

src/events/scheduled/assholeKnight.js
src/gui/Encyclopedia/encyclopediaSlaveLeaders.js 2 additions, 2 deletions

src/gui/Encyclopedia/encyclopediaSlaveLeaders.js
src/gui/Encyclopedia/encyclopediaSlaveQuirks.js 20 additions, 20 deletions

src/gui/Encyclopedia/encyclopediaSlaveQuirks.js
src/player/js/enslavePlayer.js 0 additions, 3 deletions

src/player/js/enslavePlayer.js

with 29 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