The translation is temporarily closed for contributions due to maintenance, please come back later.
The translation was automatically locked due to following alerts: Could not merge the repository.
Language Translated Untranslated Untranslated words Untranslated characters Checks Suggestions Comments
English This translation is used for source strings. Fix this component to clear its alerts. This translation is locked. 0 0 0 80 0 0
Russian Fix this component to clear its alerts. This translation is locked. 96% 13 40 248 13 0 0
Spanish Fix this component to clear its alerts. This translation is locked. 37% 268 912 5,058 270 0 0
Vietnamese Fix this component to clear its alerts. This translation is locked. 84% 65 226 1,320 67 0 0
Please sign in to see the alerts.

Overview

Project website www.cubica.net
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses bilingual files.
Source code repository git@github.com:Mindblocks3/Cubica.git
Repository branch main
Last remote commit refactor: code cleanups 6c01af6cb
Paul Pacheco authored 6 days ago
Last commit in Weblate Translated using Weblate (Vietnamese) a32ce995b
anonymous authored 13 days ago
Weblate repository http://translate.blockstory.net/git/cubica/ui/
Filemask Assets/Resources/locales/*/UI.poc

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 1,712 5,308 29,428
Source 428 1,327 7,357
Translated 79% 1,366 77% 4,130 77% 22,802
Needs editing 20% 346 22% 1,178 22% 6,626
Failing checks 25% 430 30% 1,601 30% 8,974
Strings with suggestions 0% 0 0% 0 0% 0
Not translated strings 0% 0 0% 0 0% 0

Quick numbers

5,308
Hosted words
1,712
Hosted strings
79%
Translated
1
Contributors
and previous 30 days

Trends of last 30 days

Hosted words
Hosted strings
Translated
Contributors
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
6 days ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main 6 days ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main a week ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main a week ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main a week ago
User avatar None

Failed merge on repository

Cubica / UI

Auto-merging Packages/packages-lock.json
CONFLICT (content): Merge conflict in Packages/packages-lock.json
Auto-merging Packages/manifest.json
CONFLICT (content): Merge conflict in Packages/manifest.json
CONFLICT (modify/delete): Assets/Mindblocks/Music/MusicTest.cs deleted in main and modified in HEAD. Version HEAD of Assets/Mindblocks/Music/MusicTest.cs left in tree.
CONFLICT (modify/delete): Assets/Mindblocks/Music/MidiSongInfo.cs deleted in HEAD and modified in main. Version main of Assets/Mindblocks/Music/MidiSongInfo.cs left in tree.
Auto-merging Assets/Mindblocks/Music/Jukebox.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Jukebox.cs
Auto-merging Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (content): Merge conflict in Assets/Mindblocks/Music/Editor/SongImporter.cs
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/DefaultObject.asset in main. Version main of Assets/AddressableAssetsData/DefaultObject.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset in main. Version main of Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroups.meta in main. Version main of Assets/AddressableAssetsData/AssetGroups.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/MidisTest.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AssetGroupTemplates.meta in main. Version main of Assets/AddressableAssetsData/AssetGroupTemplates.meta left in tree.
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis/8bit bomber.info.asset.meta deleted in HEAD and renamed to Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta in main. Version main of Assets/AddressableAssetsData/AddressableAssetSettings.asset.meta left in tree.
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
CONFLICT (rename/delete): Assets/Mindblocks/Music/Resources/Midis.meta deleted in HEAD and renamed to Assets/AddressableAssetsData.meta in main. Version main of Assets/AddressableAssetsData.meta left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 8678 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a week ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main a week ago
Browse all component changes