DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-11 03:19:56 +00:00
Code Issues Releases Wiki Activity

Merge branch 'feature/visual-scripting' into feature/avalonia

Browse Source
This commit is contained in:
Robert committed 2021-11-17 23:07:36 +01:00
2 parents c9c8bb7078 8f990f8f36
commit 4ef7c83c74
366 files changed
+11986 -10866
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.Core/Constants.cs
+2 -2
View File
@@ -77,13 +77,13 @@ namespace Artemis.Core
internal static JsonSerializerSettings JsonConvertSettings = new()
{
Converters = new List<JsonConverter> {new SKColorConverter(), new ForgivingIntConverter()}
Converters = new List<JsonConverter> {new SKColorConverter(), new NumericJsonConverter(), new ForgivingIntConverter()}
};
internal static JsonSerializerSettings JsonConvertTypedSettings = new()
{
TypeNameHandling = TypeNameHandling.All,
Converters = new List<JsonConverter> {new SKColorConverter(), new ForgivingIntConverter()}
Converters = new List<JsonConverter> {new SKColorConverter(), new NumericJsonConverter(), new ForgivingIntConverter()}
};
/// <summary>