Auto stash before merge of "main" and "origin/main"

This commit is contained in:
benroshio
2025-02-04 17:26:56 -05:00
parent f46716de6b
commit 2cb52e12d0
400 changed files with 23596 additions and 5990 deletions

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="MasterAssetFolder" id="{4f34473d-1e56-44db-8dd1-60284d90f95e}" />
</objects>

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.02.00">
<object class="Mixer" id="{69156779-4c9f-4c75-933c-0886f67a1e32}" />
</objects>

View File

@ -13,7 +13,7 @@
<value>Event Editor 1</value>
</property>
<property name="windowLayout">
<value>AAAACAAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAD///kPAAAAD////Z4AAAPu///5EAAAAC7///2dAAAD7QAAAAEAAAAAB4D///kQAAAALv///Z0AAAPtAAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEOP//+ZMAAACr///+IAAAA3oAAAABAgAAAAeA///4gAAAABf/////AAAENwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEOP//+ZQAAAEe///9swAABAwAAAABAgAAAAeA///4gAAAABf/////AAAENwAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANv</value>
<value>AAAACAAAABQAUAByAG8AZgBpAGwAZQByACAAMQAAAEIB2dDLAAMAAP/////////4AAAKAAAABXgAAAMOAAABpQAABy0AAATVAAAAAAIAAAAKAAAAAAAAAAAXAAAJ/wAABXcAAAAgAFAAcgBlAHMAZQB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAAAAAzHAAADIAAADlgAAAYPAAAMyAAAAz8AAA5XAAAGDgAAAAEAAAAACgAAAAzIAAADPwAADlcAAAYOAAAAHgBNAGkAeABlAHIAIABSAG8AdQB0AGkAbgBnACAAMQAAAEIB2dDLAAMAAAAABDcAAAE1AAAFyAAABCQAAAQ4AAABVAAABccAAAQjAAAAAAAAAAAKAAAABDgAAAFUAAAFxwAABCMAAAAOAE0AaQB4AGUAcgAgADIAAABCAdnQywADAAD///kPAAAAD////Z4AAAPu///5EAAAAC7///2dAAAD7QAAAAEAAAAAB4D///kQAAAALv///Z0AAAPtAAAADgBNAGkAeABlAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEOP//+egAAADf///+dQAAA64AAAABAgAAAAeA///4gAAAABf/////AAAENwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAyAAAAQgHZ0MsAAwAA//////////gAAAeAAAAEEAAAAicAAAEoAAAGRgAAAssAAAAAAgAAAAeAAAAAAAAAABcAAAd/AAAEDwAAABwARQB2AGUAbgB0ACAARQBkAGkAdABvAHIAIAAxAAAAQgHZ0MsAAwAA///4f/////gAAAAAAAAEOP//+kgAAAAt///+ZwAAAxsAAAABAgAAAAeA///4gAAAABf/////AAAENwAAAB4ARQB2AGUAbgB0ACAAQgByAG8AdwBzAGUAcgAgADEAAABCAdnQywADAAD///t4AAAAgf///QkAAANw///7eQAAAKD///0IAAADbwAAAAEAAAAAB4D///t5AAAAoP///QgAAANv</value>
</property>
<relationship name="activePlatform">
<destination>{44345994-b449-453f-9198-e8f3accd1e71}</destination>