 suprememortal
Resource updated |
|
 redned
Suggestion removed |
|
 None
Changes pushed |
Changes pushed
10/03/2025
|
 stqnley
Suggestion added |
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Alert triggered |
Could not merge the repository.
10/03/2025
|
|
None
Repository rebase failed |
Rebasing (1/1) Auto-merging projects/features/friends/src/main/resources/translations/friends_tr.properties CONFLICT (content): Merge conflict in projects/features/friends/src/main/resources/translations/friends_tr.properties Auto-merging projects/frameworks/cubecraft-core/common/src/main/resources/translations/loot_item_tr.properties CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/common/src/main/resources/translations/loot_item_tr.properties Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/friends/tr.json CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/friends/tr.json Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/generic/tr.json CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/generic/tr.json Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/lobby/tr.json CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/lobby/tr.json Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/loot_item/tr.json CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/loot_item/tr.json Auto-merging projects/frameworks/game-framework/core/src/main/resources/translations/generic_tr.properties CONFLICT (content): Merge conflict in projects/frameworks/game-framework/core/src/main/resources/translations/generic_tr.properties Auto-merging projects/games/lobby/base/src/main/resources/translations/lobby_tr.properties CONFLICT (add/add): Merge conflict in projects/games/lobby/base/src/main/resources/translations/lobby_tr.properties error: could not apply 8c186524d0a... Translation update hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply 8c186524d0a... # Translation update (1)10/03/2025 |
|
suprememortal
Resource updated |
Parsing of the “
projects/games/lobby/base/src/main/resources/translations/lobby_zh_CN.properties” file was enforced.
10/03/2025
|
|
suprememortal
Resource updated |
The “
projects/games/lobby/base/src/main/resources/translations/lobby_tr.properties” file was changed.
10/03/2025
|
projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/game.properties” file was enforced. 10/03/2025