Merge work to master #7
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…uilding, also added docker-build.sh
…d-server into develop
Release 2024-02-21
…d-server into develop
Release 2024-02-22
…d-server into develop
Release 2024-02-22.2
attempt to fix build error after merge
update locale generation to make some packages complain less
Having permission issues with the PLAYER_DETECTION.PID file. So I'm moving it to GAME_ROOT where I know we have write access
re-add some server name stuff back into the dockerfile
have docker-build reflect this fork
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Carries CVE fixes and Player detection updates from upstream