From ac00069d3c9b2d7755d2f25d716f65c92204dc58 Mon Sep 17 00:00:00 2001 From: Pyrdacor Date: Thu, 2 Jun 2022 12:11:27 +0200 Subject: [PATCH] This is v1.6.4 --- Ambermoon.Audio.Android/Ambermoon.Audio.Android.csproj | 4 ---- Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj | 3 +-- Ambermoon.Common/Ambermoon.Common.csproj | 2 +- Ambermoon.Core/Ambermoon.Core.csproj | 3 +-- Ambermoon.Data.Common/Ambermoon.Data.Common.csproj | 4 ---- .../Ambermoon.Data.FileSystems.csproj | 2 +- Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj | 3 +-- Ambermoon.Data.Legacy/Serialization/TextContainerReader.cs | 3 ++- Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj | 6 +----- Ambermoon.net/Ambermoon.net.csproj | 3 +-- Package/readme.txt | 2 +- 11 files changed, 10 insertions(+), 25 deletions(-) diff --git a/Ambermoon.Audio.Android/Ambermoon.Audio.Android.csproj b/Ambermoon.Audio.Android/Ambermoon.Audio.Android.csproj index 1095b7ac..d511b030 100644 --- a/Ambermoon.Audio.Android/Ambermoon.Audio.Android.csproj +++ b/Ambermoon.Audio.Android/Ambermoon.Audio.Android.csproj @@ -8,10 +8,6 @@ Debug;Release;DebugAndroid;ReleaseWithAndroid - - - - diff --git a/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj b/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj index a039b40f..d45c019e 100644 --- a/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj +++ b/Ambermoon.Audio.OpenAL/Ambermoon.Audio.OpenAL.csproj @@ -2,7 +2,7 @@ netstandard2.1 - 10.6.3 + 10.6.4 Robert Schneckenhaus OpenAL audio interface implementation for Ambermoon https://github.com/Pyrdacor/Ambermoon.net @@ -14,7 +14,6 @@ - diff --git a/Ambermoon.Common/Ambermoon.Common.csproj b/Ambermoon.Common/Ambermoon.Common.csproj index e6187eab..67c8f846 100644 --- a/Ambermoon.Common/Ambermoon.Common.csproj +++ b/Ambermoon.Common/Ambermoon.Common.csproj @@ -8,7 +8,7 @@ Github Library that contains basic stuff for other Ambermoon libraries. true - 10.6.3 + 10.6.4 https://github.com/Pyrdacor/Ambermoon.net Ambermoon Debug;Release;DebugAndroid diff --git a/Ambermoon.Core/Ambermoon.Core.csproj b/Ambermoon.Core/Ambermoon.Core.csproj index 2353f601..6f333f0e 100644 --- a/Ambermoon.Core/Ambermoon.Core.csproj +++ b/Ambermoon.Core/Ambermoon.Core.csproj @@ -4,7 +4,7 @@ 8 Ambermoon 5ff861f6-0255-427a-978a-7a8030ee8731 - 10.6.3 + 10.6.4 Robert Schneckenhaus https://github.com/Pyrdacor/Ambermoon.net https://github.com/Pyrdacor/Ambermoon.net @@ -29,7 +29,6 @@ true - diff --git a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj index f6f6adcf..ee40360e 100644 --- a/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj +++ b/Ambermoon.Data.Common/Ambermoon.Data.Common.csproj @@ -14,10 +14,6 @@ Debug;Release;DebugAndroid - - - - diff --git a/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj b/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj index 63f68dd6..6b20071e 100644 --- a/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj +++ b/Ambermoon.Data.FileSystems/Ambermoon.Data.FileSystems.csproj @@ -10,7 +10,7 @@ Github Ambermoon true - 10.6.3 + 10.6.4 485e4790-32fd-45f1-b729-c5ca93ba0fad Debug;Release;DebugAndroid diff --git a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj index 449faf37..b5fb0a5f 100644 --- a/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj +++ b/Ambermoon.Data.Legacy/Ambermoon.Data.Legacy.csproj @@ -10,7 +10,7 @@ Github Ambermoon Legacy Amiga Game Data true - 10.6.9 + 10.6.10 true Debug;Release;DebugAndroid @@ -24,7 +24,6 @@ - diff --git a/Ambermoon.Data.Legacy/Serialization/TextContainerReader.cs b/Ambermoon.Data.Legacy/Serialization/TextContainerReader.cs index da7a934d..748bf006 100644 --- 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 targetList, List 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 index 167fe2b6..1fd26f2b 100644 --- a/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj +++ b/Ambermoon.Renderer.OpenGL/Ambermoon.Renderer.OpenGL.csproj @@ -19,7 +19,7 @@ true - 10.6.3 + 10.6.4 Robert Schneckenhaus OpenGL render interface implementation for Ambermoon https://github.com/Pyrdacor/Ambermoon.net @@ -28,10 +28,6 @@ Ambermoon OpenGL Render Graphics Shader - - - - diff --git a/Ambermoon.net/Ambermoon.net.csproj b/Ambermoon.net/Ambermoon.net.csproj index d2aca1cd..a1cef968 100644 --- a/Ambermoon.net/Ambermoon.net.csproj +++ b/Ambermoon.net/Ambermoon.net.csproj @@ -5,7 +5,7 @@ net6.0 Ambermoon win-x86;win-x64;linux-x64;linux-arm64;osx-x64 - 1.6.3 + 1.6.4 Copyright (C) 2020-2021 by Robert Schneckenhaus Robert Schneckenhaus Robert Schneckenhaus @@ -80,7 +80,6 @@ - diff --git a/Package/readme.txt b/Package/readme.txt index 592362c7..95494672 100644 --- 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 | ------------------------------------------------------------------