2. Changes

English Turkish 19 characters editedPrevious translationState: Empty 10/07/2025

The “projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties” file was changed. 10/07/2025

English Russian 8 characters editedPrevious translationState: Translated 10/07/2025

English Russian 1 character editedPrevious translationState: Translated 10/07/2025

English Russian 2 characters editedPrevious translationState: Translated 10/07/2025

English Russian 1 character editedPrevious translationState: Translated 10/07/2025

English Russian 1 character editedPrevious translationState: Translated 10/07/2025

English Russian 1 character editedPrevious translationState: Translated 10/07/2025

The “projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_de.properties” file was changed. 10/07/2025

Repository rebased

Original revision: 7b1773e3b732740343eb3dba6816a0a0a0fa98b8
New revision: 7b1773e3b732740343eb3dba6816a0a0a0fa98b8 10/07/2025

Rebasing (1/37)
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/features/parties/src/main/resources/translations/parties_tr.properties
CONFLICT (content): Merge conflict in projects/features/parties/src/main/resources/translations/parties_tr.properties
Auto-merging projects/frameworks/cubecraft-core/common/src/main/resources/translations/loot_core_tr.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/common/src/main/resources/translations/loot_core_tr.properties
Auto-merging projects/frameworks/cubecraft-core/common/src/main/resources/translations/loot_item_de.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/common/src/main/resources/translations/loot_item_de.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/armoury/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/armoury/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/bedwars/ru.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/command/de.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/command/de.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/entities/tr.json
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/entities/tr.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/friends/tr.json
CONFLICT (content): 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/de.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/generic/de.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/lobby/tr.json
CONFLICT (content): 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_core/tr.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/loot_core/tr.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/loot_item/de.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/loot_item/de.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/loot_item/tr.json
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/loot_item/tr.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/parties/tr.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/parties/tr.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/settings/tr.json
CONFLICT (add/add): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translation_stats/settings/tr.json
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/armoury_ru.properties
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/entities_tr.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/entities_tr.properties
Auto-merging projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/settings_tr.properties
CONFLICT (content): Merge conflict in projects/frameworks/cubecraft-core/core/common/src/main/resources/translations/settings_tr.properties
Auto-merging projects/frameworks/game-framework/core/src/main/resources/translations/command_de.properties
CONFLICT (content): Merge conflict in projects/frameworks/game-framework/core/src/main/resources/translations/command_de.properties
Auto-merging projects/frameworks/game-framework/core/src/main/resources/translations/generic_de.properties
CONFLICT (content): Merge conflict in projects/frameworks/game-framework/core/src/main/resources/translations/generic_de.properties
Auto-merging projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
CONFLICT (content): Merge conflict in projects/games/bedwars/src/main/resources/translations/bedwars_ru.properties
Auto-merging projects/games/lobby/base/src/main/resources/translations/lobby_tr.properties
CONFLICT (content): Merge conflict in projects/games/lobby/base/src/main/resources/translations/lobby_tr.properties
error: could not apply 4eccebfd272... 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 4eccebfd272... # Translation update
 (1)

10/07/2025

Changes committed 10/07/2025

Changes committed 10/07/2025

Changes committed 10/07/2025

Changes committed 10/07/2025

Changes committed 10/07/2025

Changes committed 10/07/2025

Changes committed 10/07/2025

Changes committed 10/07/2025

The “projects/games/lobby/base/src/main/resources/translations/lobby_tr.properties” file was changed. 10/03/2025