Merge branch 'dev' for v0.10.7

alexdlli · Jun 21, 2023 · 816d006 · 816d006
2 parents e122e93 + f5584b8
commit 816d006
Show file tree

Hide file tree

Showing 483 changed files with 26,176 additions and 51,783 deletions.
diff --git a/.gitignore b/.gitignore
@@ -88,6 +88,7 @@ crashlytics-build.properties
 # Auto-gen
 Assets/YargInput.cs
 /[Aa]ssets/[Pp]ackages/
+/[Aa]ssets/[Ss]treamingAssets/sources/*
 
 # Rider #
 .idea/
@@ -97,4 +98,4 @@ Packages/com.thenathannator.plasticband/
 # Other
 Assets/Nyx
 Assets/Settings/TestPlayInfo.asset
-Assets/Settings/TestPlayInfo.asset.meta
+Assets/Settings/TestPlayInfo.asset.meta
diff --git a/Assembly-CSharp.csproj.DotSettings b/Assembly-CSharp.csproj.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cscript/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cscript_005Caudio_005Cbass/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cscript_005Caudio_005Cinterfaces/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cscript_005Caudio_005Cinterfaces/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=assets_005Cscript_005Cvenue_005Clights/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>