Merge branch 'main' into aether-dimension

This commit is contained in:
Bonnie
2026-03-05 18:13:56 -06:00
23 changed files with 1386 additions and 338 deletions

View File

@@ -4363,6 +4363,8 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
<ClInclude Include="Common\Network\LANSessionManager.h" />
<ClInclude Include="Common\Network\PacketRouter.h" />
<ClInclude Include="Common\Network\STUNClient.h" />
<ClInclude Include="Common\UI\UIScene_CapeSelectMenu.h" />
<ClInclude Include="Common\UI\UIScene_CustomizeCharacterMenu.h" />
<ClInclude Include="ConnectScreen.h" />
<ClInclude Include="KeyboardMouseInput.h" />
<ClInclude Include="miniupnpc\miniupnpcstrings.h" />
@@ -21537,6 +21539,8 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CU</Comman
<ClCompile Include="Common\Network\NATTraversal.cpp" />
<ClCompile Include="Common\Network\LANSessionManager.cpp" />
<ClCompile Include="Common\Network\STUNClient.cpp" />
<ClCompile Include="Common\UI\UIScene_CapeSelectMenu.cpp" />
<ClCompile Include="Common\UI\UIScene_CustomizeCharacterMenu.cpp" />
<ClCompile Include="ConnectScreen.cpp" />
<ClCompile Include="KeyboardMouseInput.cpp" />
<ClCompile Include="miniupnpc\addr_is_reserved.c" />