Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare Beta 6 #116

Merged
merged 3 commits into from
Aug 28, 2023
Merged

Prepare Beta 6 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a57bb1a
Prepate Beta 6 release
jetelain Aug 27, 2023
a64f687
Previous manifest
jetelain Aug 27, 2023
971468a
Package version
jetelain Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions GameRealisticMap.Arma3.CommandLine/GameRealisticMap.Arma3.CommandLine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AssemblyName>grma3</AssemblyName>
<FileVersion>0.6</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion GameRealisticMap.Studio.Package/Package.appxmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Identity
Name="63155JulienEtelain.GameRealisticMapStudio"
Publisher="CN=B9AF48D1-9F0E-46A7-B1BB-B050B5B81BD6"
Version="1.0.23.0" />
Version="1.0.25.0" />

<Properties>
<DisplayName>GameRealisticMap Studio</DisplayName>
Expand Down
2 changes: 1 addition & 1 deletion GameRealisticMap.Studio/GameRealisticMap.Studio.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<ApplicationIcon>Resources\grms.ico</ApplicationIcon>
<Company>GameRealisticMap</Company>
<Platforms>AnyCPU;x64</Platforms>
<FileVersion>0.5</FileVersion>
<FileVersion>0.6</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
20 changes: 19 additions & 1 deletion GameRealisticMap.Studio/Labels.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions GameRealisticMap.Studio/Labels.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,4 +1087,10 @@ Dernière génération le {1}</value>
<data name="AssetFarmLandRow" xml:space="preserve">
<value>[BETA: Inutilisé] Rangées plein champs</value>
</data>
<data name="ImportNextPartPrompt" xml:space="preserve">
<value>Cliquer sur le bouton Actualiser lorsque la partie #{0} aura été copiée, pour continuer l'import.</value>
</data>
<data name="PartHasBeenAlreadyImported" xml:space="preserve">
<value>La partie #{0} a déjà été importée.</value>
</data>
</root>
6 changes: 6 additions & 0 deletions GameRealisticMap.Studio/Labels.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,4 +1087,10 @@ Last generated on {1}</value>
<data name="AssetSmallOrchard" xml:space="preserve">
<value>Small orchard trees</value>
</data>
<data name="PartHasBeenAlreadyImported" xml:space="preserve">
<value>Part #{0} has been already imported.</value>
</data>
<data name="ImportNextPartPrompt" xml:space="preserve">
<value>Click on Refresh button when part #{0} is copied to continue import.</value>
</data>
</root>
4 changes: 2 additions & 2 deletions GameRealisticMap.Studio/Modules/Arma3WorldEditor/ViewModels/EdenImporterViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ private void DoDetect(string value)
var intersect = Batch.PartIndexes.Intersect(batch.PartIndexes).ToList();
if (intersect.Any())
{
ClipboardError = string.Format("Part #{0} has been already imported.", intersect.First());
ClipboardError = string.Format(GameRealisticMap.Studio.Labels.PartHasBeenAlreadyImported, intersect.First());
}
else
{
Expand Down Expand Up @@ -165,7 +165,7 @@ private static string GetNextPartMessage(WrpEditBatch batch)
{
return string.Empty;
}
return string.Format("Click on Refresh button when part #{0} is copied to continue import.", missing.Min() + 1);
return string.Format(GameRealisticMap.Studio.Labels.ImportNextPartPrompt, missing.Min() + 1);
}

public Task ClipboardImport()
Expand Down
Loading