Update production#1237
Merged
Merged
Conversation
Kurocon
commented
Jun 25, 2026
Kurocon
commented
Member
- Allow saving Minecraft username for server whitelist
- Update translations
Add Minecraft whitelist support
Currently translated at 100.0% (2948 of 2948 strings) Translated using Weblate (Dutch) Currently translated at 99.7% (2941 of 2948 strings) Co-authored-by: Kevin Alberts <albertskja@inter-actief.net> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Weblate <noreply@weblate.org> Translate-URL: https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/ Translation: Amelie/Amelie
Translations update from Inter-/Actief/ Weblate
|
Triggered from #1237 by @Kurocon. Checking if we can fast forward Target branch ( commit 0c6c0bd282276bc21b471388547adc80860e4075 (HEAD -> production, origin/production)
Merge: 2f07d87 1a9feb0
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Thu Jun 25 19:55:29 2026 +0200
Merge pull request #1235 from Inter-Actief/ia-weblate
Translations update from Inter-/Actief/ WeblatePull request ( commit bdb4a0255003a3f00c156607b8dc733f7da86d1c (pull_request/main)
Merge: 4a8cb73 cc9c8a5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Thu Jun 25 23:12:51 2026 +0200
Merge pull request #1236 from Inter-Actief/ia-weblate
Translations update from Inter-/Actief/ WeblateIt is possible to fast forward |
Member
Author
|
/fast-forward |
|
Triggered from #1237 (comment) by @Kurocon. Trying to fast forward Target branch ( commit 0c6c0bd282276bc21b471388547adc80860e4075 (HEAD -> production, origin/production)
Merge: 2f07d87 1a9feb0
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Thu Jun 25 19:55:29 2026 +0200
Merge pull request #1235 from Inter-Actief/ia-weblate
Translations update from Inter-/Actief/ WeblatePull request ( commit bdb4a0255003a3f00c156607b8dc733f7da86d1c (pull_request/main)
Merge: 4a8cb73 cc9c8a5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Thu Jun 25 23:12:51 2026 +0200
Merge pull request #1236 from Inter-Actief/ia-weblate
Translations update from Inter-/Actief/ WeblateFast forwarding $ git push origin bdb4a0255003a3f00c156607b8dc733f7da86d1c:production
remote: Bypassed rule violations for refs/heads/production:
remote:
remote: - At least 1 approving review is required by reviewers with write access.
remote:
To https://github.com/Inter-Actief/amelie.git
0c6c0bd..bdb4a02 bdb4a0255003a3f00c156607b8dc733f7da86d1c -> production |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.