Restore stashed changes and repair LFS conflicts

2026-07-24 04:11:14 -04:00
parent fe00ecfcc7
commit 7995cab04a
23 changed files with 1008 additions and 1132 deletions
--- a/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/Android/Android.manifest
@@ -1,21 +1,21 @@
 ManifestFileVersion: 0
 UnityVersion: 6000.3.7f1
-CRC: 1212460786
+CRC: 3630187769
 HashAppended: 0
 AssetBundleManifest:
  AssetBundleInfos:
    Info_0:
-      Name: shapes
+      Name: unifiedraytracing
      Dependencies: {}
    Info_1:
      Name: basic
      Dependencies: {}
    Info_2:
-      Name: metropolis_on_orbit
-      Dependencies: {}
-    Info_3:
      Name: departure_to_multiverse
      Dependencies: {}
-    Info_4:
-      Name: unifiedraytracing
+    Info_3:
+      Name: metropolis_on_orbit
+      Dependencies: {}
+    Info_4:
+      Name: shapes
      Dependencies: {}