This is v1.6.4

Pyrdacor · Jun 2, 2022 · ac00069 · ac00069
1 parent 43247ee
commit ac00069
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 25 deletions.
diff --git a/Ambermoon.Audio.Android/Ambermoon.Audio.Android.csproj b/Ambermoon.Audio.Android/Ambermoon.Audio.Android.csproj
@@ -8,10 +8,6 @@
     <Configurations>Debug;Release;DebugAndroid;ReleaseWithAndroid</Configurations>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="10.6.6" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Ambermoon.Data.Common\Ambermoon.Data.Common.csproj" />
   </ItemGroup>

diff --git a/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj b/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>10.6.3</Version>
+    <Version>10.6.4</Version>
     <Authors>Robert Schneckenhaus</Authors>
     <Description>OpenAL audio interface implementation for Ambermoon</Description>
     <RepositoryUrl>https://github.com/Pyrdacor/Ambermoon.net</RepositoryUrl>
@@ -14,7 +14,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="10.6.6" />
     <PackageReference Include="Silk.NET.OpenAL" Version="2.15.0" />
     <PackageReference Include="Silk.NET.OpenAL.Extensions.Soft" Version="2.15.0" />
     <PackageReference Include="Silk.NET.OpenAL.Soft.Native" Version="1.21.1.1" />

diff --git a/Ambermoon.Common/Ambermoon.Common.csproj b/Ambermoon.Common/Ambermoon.Common.csproj
@@ -8,7 +8,7 @@
     <RepositoryType>Github</RepositoryType>
     <Description>Library that contains basic stuff for other Ambermoon libraries.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>10.6.3</Version>
+    <Version>10.6.4</Version>
     <PackageProjectUrl>https://github.com/Pyrdacor/Ambermoon.net</PackageProjectUrl>
     <PackageTags>Ambermoon</PackageTags>
     <Configurations>Debug;Release;DebugAndroid</Configurations>

diff --git a/Ambermoon.Core/Ambermoon.Core.csproj b/Ambermoon.Core/Ambermoon.Core.csproj
@@ -4,7 +4,7 @@
     <LangVersion>8</LangVersion>
     <RootNamespace>Ambermoon</RootNamespace>
     <UserSecretsId>5ff861f6-0255-427a-978a-7a8030ee8731</UserSecretsId>
-    <Version>10.6.3</Version>
+    <Version>10.6.4</Version>
     <Authors>Robert Schneckenhaus</Authors>
     <PackageProjectUrl>https://github.com/Pyrdacor/Ambermoon.net</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Pyrdacor/Ambermoon.net</RepositoryUrl>
@@ -29,7 +29,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="10.6.6" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>

diff --git a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj
@@ -14,10 +14,6 @@
     <Configurations>Debug;Release;DebugAndroid</Configurations>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Ambermoon.Common" Version="10.6.3" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Ambermoon.Common\Ambermoon.Common.csproj" />
   </ItemGroup>

diff --git a/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj b/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj
@@ -10,7 +10,7 @@
 	<RepositoryType>Github</RepositoryType>
 	<PackageTags>Ambermoon</PackageTags>
 	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-	<Version>10.6.3</Version>
+	<Version>10.6.4</Version>
 	<UserSecretsId>485e4790-32fd-45f1-b729-c5ca93ba0fad</UserSecretsId>
 	<Configurations>Debug;Release;DebugAndroid</Configurations>
   </PropertyGroup>

diff --git a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj
@@ -10,7 +10,7 @@
     <RepositoryType>Github</RepositoryType>
     <PackageTags>Ambermoon Legacy Amiga Game Data</PackageTags>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>10.6.9</Version>
+    <Version>10.6.10</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Configurations>Debug;Release;DebugAndroid</Configurations>
   </PropertyGroup>
@@ -24,7 +24,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="10.6.6" />
     <PackageReference Include="SonicArranger" Version="1.0.9" />
   </ItemGroup>
 

diff --git a/Ambermoon.Data.Legacy/Serialization/TextContainerReader.cs b/Ambermoon.Data.Legacy/Serialization/TextContainerReader.cs
@@ -1,5 +1,6 @@
 using Ambermoon.Data.Serialization;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace Ambermoon.Data.Legacy.Serialization
@@ -213,7 +214,7 @@ void ReadTextSection(List<string> targetList, List<int> placeholderIndicesToWrit
                         }
                         else if (processUIPlaceholders)
                         {
-                            var matches = placeholderRegex.Matches(text);
+                            var matches = placeholderRegex.Matches(text).Where(m => m.Value.StartsWith('0')).ToList();
 
                             for (int m = matches.Count - 1; m >= 0; --m)
                             {

diff --git a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj
@@ -19,7 +19,7 @@
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Version>10.6.3</Version>
+    <Version>10.6.4</Version>
     <Authors>Robert Schneckenhaus</Authors>
     <Description>OpenGL render interface implementation for Ambermoon</Description>
     <PackageProjectUrl>https://github.com/Pyrdacor/Ambermoon.net</PackageProjectUrl>
@@ -28,10 +28,6 @@
     <PackageTags>Ambermoon OpenGL Render Graphics Shader</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Common" Version="10.6.6" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(Configuration)'=='DebugAndroid'">
 	<PackageReference Include="Silk.NET.OpenGLES" Version="2.13.0" />
   </ItemGroup>

diff --git a/Ambermoon.net/Ambermoon.net.csproj b/Ambermoon.net/Ambermoon.net.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Ambermoon</RootNamespace>
     <RuntimeIdentifiers>win-x86;win-x64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
-    <Version>1.6.3</Version>
+    <Version>1.6.4</Version>
     <Copyright>Copyright (C) 2020-2021 by Robert Schneckenhaus</Copyright>
     <Company>Robert Schneckenhaus</Company>
     <Authors>Robert Schneckenhaus</Authors>
@@ -80,7 +80,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ambermoon.Data.Legacy" Version="10.6.9" />
     <PackageReference Include="glfw" Version="3.3.6" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NLayer" Version="1.14.0" />

diff --git a/Package/readme.txt b/Package/readme.txt
@@ -7,7 +7,7 @@
 
 
             ------------------------------------------------------------------
-            |   Ambermoon rewrite by Pyrdacor - Version 1.6.3 - June 2022    |
+            |   Ambermoon rewrite by Pyrdacor - Version 1.6.4 - June 2022    |
             ------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
                 ------------------------------------------------------------------
-                |   Ambermoon rewrite by Pyrdacor - Version 1.6.3 - June 2022    |
+                |   Ambermoon rewrite by Pyrdacor - Version 1.6.4 - June 2022    |
                 ------------------------------------------------------------------
@@ Expand Down @@