Skip to content

Commit 5759d6f

Browse files
anoyettaanoyetta
committed
Merge branch develop v1.4.8.4114-Stable
2 parents 2df9008 + 2d0b919 commit 5759d6f

File tree

9 files changed

+55
-34
lines changed

9 files changed

+55
-34
lines changed

‎CURRENT_VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.4.7.3116-Stable
1+
v1.4.8.4114-Stable

‎RELEASE_NOTES.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,4 +539,14 @@
539539
* [Minor] fixed #26 チャットログの描画について仮想化を有効にした
540540
</description>
541541
</note>
542+
543+
<note>
544+
<version>1.4.8.4114</version>
545+
<channel>Stable</channel>
546+
<timestamp>2020-02-19T14:09:06.1809976+09:00</timestamp>
547+
<uri>https://github.com/anoyetta/RINGS/releases/download/v1.4.8.4114-Stable/RINGS_v1_4_8_4114_Stable.zip</uri>
548+
<description>
549+
* [Minor] sharlayan が正しく動作していないときでもそれなりに動作するような対応を搭載した
550+
</description>
551+
</note>
542552
</release_notes>

‎source/RINGS.Experience/RINGS.Experience.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
</ItemGroup>
5555
<ItemGroup>
5656
<PackageReference Include="Discord.Net">
57-
<Version>1.0.2</Version>
57+
<Version>2.1.1</Version>
5858
</PackageReference>
5959
<PackageReference Include="Newtonsoft.Json">
60-
<Version>12.0.2</Version>
60+
<Version>12.0.3</Version>
6161
</PackageReference>
6262
<PackageReference Include="Sharlayan">
63-
<Version>5.0.4</Version>
63+
<Version>5.0.5</Version>
6464
</PackageReference>
6565
</ItemGroup>
6666
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎source/RINGS/Models/ChatLogModel.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,11 +654,20 @@ public static ChatLogModel FromXIVLog(
654654

655655
var currentProfName = Config.Instance.ActiveProfile?.CharacterName;
656656

657+
var speakerSafix = string.Empty;
657658
var i = xivLog.Line.IndexOf(":");
659+
660+
if (i < 0)
661+
{
662+
// sharlayan がパッチに対応していないときの回避策
663+
i = xivLog.Line.IndexOf(".");
664+
speakerSafix = ".";
665+
}
666+
658667
if (i >= 0)
659668
{
660669
// 話者の部分を取り出す
661-
var speakerPart = xivLog.Line.Substring(0, i);
670+
var speakerPart = $"{xivLog.Line.Substring(0, i)}{speakerSafix}";
662671

663672
// 話者から特殊文字を除去する
664673
speakerPart = RemoveSpecialChar(speakerPart);

‎source/RINGS/RINGS.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -252,13 +252,13 @@
252252
</ItemGroup>
253253
<ItemGroup>
254254
<PackageReference Include="Costura.Fody">
255-
<Version>4.0.0</Version>
255+
<Version>4.1.0</Version>
256256
</PackageReference>
257257
<PackageReference Include="Discord.Net">
258-
<Version>1.0.2</Version>
258+
<Version>2.1.1</Version>
259259
</PackageReference>
260260
<PackageReference Include="Fody">
261-
<Version>5.1.1</Version>
261+
<Version>6.1.0</Version>
262262
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
263263
<PrivateAssets>all</PrivateAssets>
264264
</PackageReference>
@@ -272,34 +272,34 @@
272272
<Version>1.6.5</Version>
273273
</PackageReference>
274274
<PackageReference Include="MahApps.Metro.IconPacks">
275-
<Version>2.3.0</Version>
275+
<Version>3.2.0</Version>
276276
</PackageReference>
277277
<PackageReference Include="MaterialDesignColors">
278-
<Version>1.1.3</Version>
278+
<Version>1.2.2</Version>
279279
</PackageReference>
280280
<PackageReference Include="MaterialDesignThemes">
281-
<Version>2.5.1</Version>
281+
<Version>3.0.1</Version>
282282
</PackageReference>
283283
<PackageReference Include="MaterialDesignThemes.MahApps">
284-
<Version>0.0.12</Version>
284+
<Version>0.1.0</Version>
285285
</PackageReference>
286286
<PackageReference Include="MouseKeyHook">
287287
<Version>5.6.0</Version>
288288
</PackageReference>
289289
<PackageReference Include="Newtonsoft.Json">
290-
<Version>12.0.2</Version>
290+
<Version>12.0.3</Version>
291291
</PackageReference>
292292
<PackageReference Include="NLog">
293-
<Version>4.6.5</Version>
293+
<Version>4.6.8</Version>
294294
</PackageReference>
295295
<PackageReference Include="Prism.Wpf">
296-
<Version>7.1.0.431</Version>
296+
<Version>7.2.0.1422</Version>
297297
</PackageReference>
298298
<PackageReference Include="PropertyChanged.Fody">
299-
<Version>3.0.1</Version>
299+
<Version>3.2.6</Version>
300300
</PackageReference>
301301
<PackageReference Include="Sharlayan">
302-
<Version>5.0.4</Version>
302+
<Version>5.0.5</Version>
303303
</PackageReference>
304304
</ItemGroup>
305305
<ItemGroup>

‎source/RINGS/Version.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
using System.Reflection;
22

3-
[assembly: AssemblyVersion("1.4.7.3116")]
3+
[assembly: AssemblyVersion("1.4.8.4114")]
44
[assembly: AssemblyConfiguration("Stable")]

‎source/aframe/source/aframe.Core/SuspendableObservableCollection.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
using System.Collections.ObjectModel;
33
using System.Collections.Specialized;
44
using System.Linq;
5+
using PropertyChanged;
56

67
namespace aframe
78
{
9+
[SuppressPropertyChangedWarnings]
810
public class SuspendableObservableCollection<T> : ObservableCollection<T>
911
{
1012
public SuspendableObservableCollection()

‎source/aframe/source/aframe.Core/aframe.Core.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
</ItemGroup>
215215
<ItemGroup>
216216
<PackageReference Include="Fody">
217-
<Version>5.1.1</Version>
217+
<Version>6.1.0</Version>
218218
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
219219
<PrivateAssets>all</PrivateAssets>
220220
</PackageReference>
@@ -225,16 +225,16 @@
225225
<Version>1.6.5</Version>
226226
</PackageReference>
227227
<PackageReference Include="MahApps.Metro.IconPacks">
228-
<Version>2.3.0</Version>
228+
<Version>3.2.0</Version>
229229
</PackageReference>
230230
<PackageReference Include="MaterialDesignColors">
231-
<Version>1.1.3</Version>
231+
<Version>1.2.2</Version>
232232
</PackageReference>
233233
<PackageReference Include="MaterialDesignThemes">
234-
<Version>2.5.1</Version>
234+
<Version>3.0.1</Version>
235235
</PackageReference>
236236
<PackageReference Include="MaterialDesignThemes.MahApps">
237-
<Version>0.0.12</Version>
237+
<Version>0.1.0</Version>
238238
</PackageReference>
239239
<PackageReference Include="Microsoft.AspNet.WebApi.Client">
240240
<Version>5.2.7</Version>
@@ -246,31 +246,31 @@
246246
<Version>1.0.0</Version>
247247
</PackageReference>
248248
<PackageReference Include="Newtonsoft.Json">
249-
<Version>12.0.2</Version>
249+
<Version>12.0.3</Version>
250250
</PackageReference>
251251
<PackageReference Include="NLog">
252-
<Version>4.6.5</Version>
252+
<Version>4.6.8</Version>
253253
</PackageReference>
254254
<PackageReference Include="Prism.Wpf">
255-
<Version>7.1.0.431</Version>
255+
<Version>7.2.0.1422</Version>
256256
</PackageReference>
257257
<PackageReference Include="PropertyChanged.Fody">
258-
<Version>3.0.1</Version>
258+
<Version>3.2.6</Version>
259259
</PackageReference>
260260
<PackageReference Include="ReactiveProperty">
261-
<Version>5.6.0</Version>
261+
<Version>6.2.0</Version>
262262
</PackageReference>
263263
<PackageReference Include="System.Diagnostics.DiagnosticSource">
264-
<Version>4.5.1</Version>
264+
<Version>4.7.0</Version>
265265
</PackageReference>
266266
<PackageReference Include="System.Numerics.Vectors">
267267
<Version>4.5.0</Version>
268268
</PackageReference>
269269
<PackageReference Include="System.Reactive">
270-
<Version>4.1.5</Version>
270+
<Version>4.3.2</Version>
271271
</PackageReference>
272272
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
273-
<Version>4.5.2</Version>
273+
<Version>4.7.0</Version>
274274
</PackageReference>
275275
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
276276
<Version>4.3.0</Version>

‎source/aframe/source/aframe.Updater/aframe.Updater.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@
102102
</ItemGroup>
103103
<ItemGroup>
104104
<PackageReference Include="Costura.Fody">
105-
<Version>4.0.0</Version>
105+
<Version>4.1.0</Version>
106106
</PackageReference>
107107
<PackageReference Include="Fody">
108-
<Version>5.1.1</Version>
108+
<Version>6.1.0</Version>
109109
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
110110
<PrivateAssets>all</PrivateAssets>
111111
</PackageReference>
112112
<PackageReference Include="Newtonsoft.Json">
113-
<Version>12.0.2</Version>
113+
<Version>12.0.3</Version>
114114
</PackageReference>
115115
</ItemGroup>
116116
<ItemGroup>

0 commit comments

Comments
 (0)