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 78 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 fix compilation error f9c411618
Paul Pacheco authored 10 hours ago
Last commit in Weblate Simplify jukebox with addressables 48f028c11
Paul Pacheco authored yesterday
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% 428 29% 1,586 30% 8,909
Strings with suggestions 0% 0 0% 0 0% 0
Not translated strings 0% 0 0% 0 0% 0
Last year Previous

Activity in last 12 months

2 changes 324 changes 10 changes 13 changes 0 changes 5 changes 0 changes 14 changes 0 changes 24 changes 0 changes 339 changes 0 changes 150 changes 0 changes 290 changes 0 changes 45 changes 0 changes 6 changes 0 changes 12 changes 119 changes 53 changes
Aug Sep Oct Nov Dec Jan Feb Mar Apr May Jun Jul

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
—
-100%
Contributors
+50%
User avatar None

Failed merge on repository

Cubica / UI 

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/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset and Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta and Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData.meta
Automatic merge failed; fix conflicts and then commit the result.
 (1)
10 hours ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main 10 hours ago
User avatar None

Failed merge on repository

Cubica / UI 

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/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset and Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta and Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData.meta
Automatic merge failed; fix conflicts and then commit the result.
 (1)
10 hours ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main 10 hours ago
User avatar None

Failed merge on repository

Cubica / UI 

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/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset and Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta and Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData.meta
Automatic merge failed; fix conflicts and then commit the result.
 (1)
10 hours ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main 10 hours ago
User avatar None

Failed merge on repository

Cubica / UI 

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/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset and Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta and Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData.meta
Automatic merge failed; fix conflicts and then commit the result.
 (1)
11 hours ago
User avatar None

Received repository notification

Cubica / UI

GitHub: https://github.com/Mindblocks3/Cubica, main 11 hours ago
User avatar None

Failed merge on repository

Cubica / UI 

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/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset->Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Packed Assets_ContentUpdateGroupSchema.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset"->"Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset and Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Built In Data_PlayerDataGroupSchema.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Schemas/Local Assets_ContentUpdateGroupSchema.asset
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset
CONFLICT (rename/rename): Rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta" in branch "HEAD" rename "Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta"->"Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta" in "main"
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta and Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta, both renamed from Assets/Mindblocks/Music/Resources/Midis/Chaotic Inferno.info.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
Auto-merging Assets/AddressableAssetsData/AssetGroups/Local Assets.asset
CONFLICT (rename/rename): Rename Assets/Mindblocks/Music/Resources/Midis/Angelic Strain.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in HEAD. Rename Assets/Mindblocks/Music/Resources/Midis/Combat.info.asset.meta->Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta in main
Auto-merging Assets/AddressableAssetsData/AssetGroups/Built In Data.asset.meta
Auto-merging Assets/AddressableAssetsData/AssetGroups.meta
Auto-merging Assets/AddressableAssetsData/AssetGroupTemplates.meta
CONFLICT (add/add): Merge conflict in Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData/AddressableAssetSettings.asset
Auto-merging Assets/AddressableAssetsData.meta
Automatic merge failed; fix conflicts and then commit the result.
 (1)
12 hours ago
User avatar None

Received repository notification

Cubica / UI

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