get ready to chuck read to me on experimental

oh boy i can't wait to manually resolve 100 merge conflicts this morning
callistoAshley · Jan 26, 2022 · 5d8b081 · 5d8b081
1 parent 2e286af
commit 5d8b081
Show file tree

Hide file tree

Showing 54 changed files with 11 additions and 12,824 deletions.
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -106,8 +106,6 @@
     <Compile Include="Assets\scripts\UIManager.cs" />
     <Compile Include="Assets\scripts\UINavigateable.cs" />
     <None Include="Assets\Packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.xml" />
-    <None Include="Assets\Packages\System.Speech.6.0.2-mauipre.1.22054.8\lib\net6.0\System.Speech.xml" />
-    <None Include="Assets\Packages\System.Speech.6.0.2-mauipre.1.22054.8\useSharedDesignerContext.txt" />
     <Reference Include="Unity.Timeline.Editor">
       <HintPath>C:/Users/maste/Desktop/Unity Projects/space!!!!/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
     </Reference>
@@ -321,9 +319,6 @@
     <Reference Include="Newtonsoft.Json">
       <HintPath>C:/Users/maste/Desktop/Unity Projects/space!!!!/Assets/Packages/Newtonsoft.Json.13.0.1/lib/net45/Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Speech">
-      <HintPath>C:/Users/maste/Desktop/Unity Projects/space!!!!/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/lib/net6.0/System.Speech.dll</HintPath>
-    </Reference>
     <Reference Include="mscorlib">
       <HintPath>C:/Program Files/Unity/Hub/Editor/2019.2.8f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll</HintPath>
     </Reference>

diff --git a/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8.meta b/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8.meta
diff --git a/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/.signature.p7s b/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/.signature.p7s
diff --git a/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/Icon.png b/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/Icon.png
diff --git a/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/Icon.png.meta b/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/Icon.png.meta
diff --git a/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/LICENSE.TXT b/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/LICENSE.TXT
diff --git a/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/LICENSE.TXT.meta b/Assets/Packages/System.Speech.6.0.2-mauipre.1.22054.8/LICENSE.TXT.meta
diff --git a/...ackages/System.Speech.6.0.2-mauipre.1.22054.8/System.Speech.6.0.2-mauipre.1.22054.8.nupkg b/...ackages/System.Speech.6.0.2-mauipre.1.22054.8/System.Speech.6.0.2-mauipre.1.22054.8.nupkg
diff --git a/...es/System.Speech.6.0.2-mauipre.1.22054.8/System.Speech.6.0.2-mauipre.1.22054.8.nupkg.meta b/...es/System.Speech.6.0.2-mauipre.1.22054.8/System.Speech.6.0.2-mauipre.1.22054.8.nupkg.meta