From 8fa0c08c0f65d3dd7a4849fe7859799b26ee9b53 Mon Sep 17 00:00:00 2001 From: benroshio <148654002+benroshio@users.noreply.github.com> Date: Mon, 5 May 2025 19:09:35 -0400 Subject: [PATCH 1/3] Auto stash before merge of "main" and "origin/main" --- .gitignore | 2 ++ ...{0bbb457e-d56a-416c-be6b-d409dd3caa27}.pdc | Bin 2776 -> 2776 bytes ...{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc | Bin 7224 -> 7224 bytes ...{1f006aa4-2ede-44e7-888d-12cfc0bd0ffd}.pdc | Bin 13464 -> 13464 bytes ...{22e7f674-6e11-4c64-9219-cf1dc717edfa}.pdc | Bin 3608 -> 3608 bytes ...{36354e40-3dbe-4f55-89f5-e0d93dc1fcf6}.pdc | Bin 3016 -> 3016 bytes ...{3896e310-298f-4517-9f89-0ddda1bf8d7d}.pdc | Bin 2920 -> 2920 bytes ...{43a3738c-0acc-4951-a6dc-67681b238fc4}.pdc | Bin 4072 -> 4072 bytes ...{560e5048-fa34-470c-a547-e017b5f3befd}.pdc | Bin 3736 -> 3736 bytes ...{7193869a-af7a-4abf-ac2e-d663b6b44edd}.pdc | Bin 7224 -> 7224 bytes ...{7b317089-ccca-48ae-9f1a-6b8308200c06}.pdc | Bin 7224 -> 7224 bytes ...{7e119f9b-f0f1-4954-ba30-71821aa433b9}.pdc | Bin 4312 -> 4312 bytes ...{8a7ed645-a152-4865-a244-8470f987f3c7}.pdc | Bin 3000 -> 3000 bytes ...{8f1e7d26-73b7-4fd0-b70d-d621062ebc01}.pdc | Bin 7224 -> 7224 bytes ...{9320f236-2680-4849-a8b0-e89d8e97eb9b}.pdc | Bin 7224 -> 7224 bytes ...{b1767621-0ae0-475c-8f68-0acbb39c8ab5}.pdc | Bin 2616 -> 2616 bytes ...{c7c66cb4-26fb-49bf-919f-8fb5a757e10a}.pdc | Bin 4232 -> 4232 bytes ...{d6fa3d66-6061-46d9-a4a9-b2b12b49d71b}.pdc | Bin 7224 -> 7224 bytes ...{eb42c67b-328e-4f48-9cf4-86f7f8606e26}.pdc | Bin 7224 -> 7224 bytes ...473d-1e56-44db-8dd1-60284d90f95e}.user.xml | 4 +++ .../Metadata/Mixer.user.xml} | 2 +- .../.user/Metadata/Workspace.user.xml | 23 ++++++++++++++++++ ...{d547300b-f688-4816-b2a8-0edd5f5e77a1}.xml | 23 ------------------ .../Illusions/.unsaved/dragon ult uncut.ogg | Bin 968049 -> 0 bytes .../.unsaved/metadataFileMapping.data | Bin 1858 -> 0 bytes .../.user/Metadata/Workspace.user.xml | 2 +- ...{bc8f13ed-8783-4e69-8dac-132b7783a4c0}.xml | 0 ...{6b62b736-8a10-493e-93b4-17b6b7b1bf14}.xml | 0 28 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 .gitignore create mode 100644 hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml rename hwanyoung2/Content/Illusions/.unsaved/{Metadata/Event/{4ff730ba-f1d1-4efd-9dfe-1811ce2538c2}.xml => .user/Metadata/Mixer.user.xml} (55%) create mode 100644 hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Workspace.user.xml delete mode 100644 hwanyoung2/Content/Illusions/.unsaved/Metadata/AudioFile/{d547300b-f688-4816-b2a8-0edd5f5e77a1}.xml delete mode 100644 hwanyoung2/Content/Illusions/.unsaved/dragon ult uncut.ogg delete mode 100644 hwanyoung2/Content/Illusions/.unsaved/metadataFileMapping.data rename hwanyoung2/Content/Illusions/{.unsaved => }/Metadata/Event/{bc8f13ed-8783-4e69-8dac-132b7783a4c0}.xml (100%) rename hwanyoung2/Content/Illusions/{.unsaved => }/Metadata/EventFolder/{6b62b736-8a10-493e-93b4-17b6b7b1bf14}.xml (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..cd90eac8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +hwanyoung2/Content/Illusions/.cache/\{d547300b-f688-4816-b2a8-0edd5f5e77a1\}.pdc diff --git a/hwanyoung2/Content/Illusions/.cache/{0bbb457e-d56a-416c-be6b-d409dd3caa27}.pdc b/hwanyoung2/Content/Illusions/.cache/{0bbb457e-d56a-416c-be6b-d409dd3caa27}.pdc index 47ed64f3143ea668c396c2eb40b83cdf61cadce7..bb070ff00b6ab12a20b9d8a5a716258c8b74dc76 100644 GIT binary patch delta 25 fcmca1dP7ve!^Jy*fq{Vuhy^k@Pcm;5IKc$~P;CYD delta 25 fcmca1dP7ve!^Jy*fq{Vuhy~LB-znHAaDoc}S+WOd diff --git a/hwanyoung2/Content/Illusions/.cache/{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc b/hwanyoung2/Content/Illusions/.cache/{1398de11-cb1d-4f33-8375-570ac31aa133}.pdc index 9fcfb360388d1616f358c231c787e44aaf459e05..396cfe4a902bb6287506a5bfea01e271de72bf96 100644 GIT binary patch delta 25 fcmdmCvBN^Z!^Jy*fq{Vuhy^k@Pcm;5(2xNDPl*L= delta 25 fcmdmCvBN^Z!^Jy*fq{Vuhy^m(FUM^Z(2xNDQGNx_ diff --git a/hwanyoung2/Content/Illusions/.cache/{1f006aa4-2ede-44e7-888d-12cfc0bd0ffd}.pdc b/hwanyoung2/Content/Illusions/.cache/{1f006aa4-2ede-44e7-888d-12cfc0bd0ffd}.pdc index 96a5d2d595113491be2e23c2000930e713875dea..f10bb1a9e6ab137089350232b450d23f46804ce4 100644 GIT binary patch delta 25 fcmbP{IU`fR!^Jy*fq{Vuhy~J_
henMQp!^Jy*fq{Vuhy^k@Pcm;5*uf0|O{xXS
delta 25
fcmX>henMQp!^Jy*fq{Vuhy~LB-znHAu!9=_R__Ns
diff --git a/hwanyoung2/Content/Illusions/.cache/{3896e310-298f-4517-9f89-0ddda1bf8d7d}.pdc b/hwanyoung2/Content/Illusions/.cache/{3896e310-298f-4517-9f89-0ddda1bf8d7d}.pdc
index 89cd5d0303cd1d34d7a456a5d5b7822976935935..96027c92a7e11938e7422618eb4fa07de9dbf96a 100644
GIT binary patch
delta 25
fcmaDM_Cid+!^Jy*fq{Vuhy^k@Pcm;5h~NeQQoIGH
delta 25
fcmaDM_Cid+!^Jy*fq{Vuhy~LB-znHA5Wx)qTmc6h
diff --git a/hwanyoung2/Content/Illusions/.cache/{43a3738c-0acc-4951-a6dc-67681b238fc4}.pdc b/hwanyoung2/Content/Illusions/.cache/{43a3738c-0acc-4951-a6dc-67681b238fc4}.pdc
index 47e8d59d90987a9f79020b6ad6e85919ba78fc59..2556805bda1d221de560a7412ae8c7478aa0a518 100644
GIT binary patch
delta 25
fcmaDM|3Y5C!^Jy*fq{Vuhy^k@Pcm;5xWNwqRbB=?
delta 25
fcmaDM|3Y5C!^Jy*fq{Vuhy~LB-znHAaDyKJUZV%H
diff --git a/hwanyoung2/Content/Illusions/.cache/{560e5048-fa34-470c-a547-e017b5f3befd}.pdc b/hwanyoung2/Content/Illusions/.cache/{560e5048-fa34-470c-a547-e017b5f3befd}.pdc
index 3aa5b10063577f4890c0463cd2adb947f2504ec7..79affba44170e84e830c9aca14eddd5aeb8630fe 100644
GIT binary patch
delta 25
fcmbOsJ405$!^Jy*fq{Vuhy^k@Pcm;5=->kYMPUU<
delta 25
fcmbOsJ405$!^Jy*fq{Vuhy~LB-znHA(7^`)PNoLE
diff --git a/hwanyoung2/Content/Illusions/.cache/{7193869a-af7a-4abf-ac2e-d663b6b44edd}.pdc b/hwanyoung2/Content/Illusions/.cache/{7193869a-af7a-4abf-ac2e-d663b6b44edd}.pdc
index 84d5e3feef6b99195961bd0d5126d2c63658bcca..e1976ef0b93323af4f553b95b3a1de08dcbda70c 100644
GIT binary patch
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^k@Pcm;5(2xNDPl*L=
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^m(FUM^Z(2xNDQGNx_
diff --git a/hwanyoung2/Content/Illusions/.cache/{7b317089-ccca-48ae-9f1a-6b8308200c06}.pdc b/hwanyoung2/Content/Illusions/.cache/{7b317089-ccca-48ae-9f1a-6b8308200c06}.pdc
index 3a3f02fc2a8468cff07007accf93426ed7f3a097..9953800d14c76323d99d600e28b7ea3c74884c7b 100644
GIT binary patch
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^k@Pcm;5(2xNDPl*L=
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^m(FUM^Z(2xNDQGNx_
diff --git a/hwanyoung2/Content/Illusions/.cache/{7e119f9b-f0f1-4954-ba30-71821aa433b9}.pdc b/hwanyoung2/Content/Illusions/.cache/{7e119f9b-f0f1-4954-ba30-71821aa433b9}.pdc
index 62fc9b5353d63ad77d62612dbcfcbe22f93cb3a8..8eb2ab7e3c76b16dadf337fcf171089af7148ef0 100644
GIT binary patch
delta 25
fcmcbictcUZ!^Jy*fq{Vuhy^k@Pcm;5I3WN4Qkw=6
delta 25
fcmcbictcUZ!^Jy*fq{Vuhy~LB-znHAa6$k8Ti^$W
diff --git a/hwanyoung2/Content/Illusions/.cache/{8a7ed645-a152-4865-a244-8470f987f3c7}.pdc b/hwanyoung2/Content/Illusions/.cache/{8a7ed645-a152-4865-a244-8470f987f3c7}.pdc
index 3fd84f20550b1da7ed9a60b8bec9e1f8d4105aa3..d3dbdbef13f281d2db14de3f6b1ec1c5ca1f191d 100644
GIT binary patch
delta 25
fcmdlXzC&EV!^Jy*fq{Vuhy^k@Pcm;5SiubdN{R)U
delta 25
fcmdlXzC&EV!^Jy*fq{Vuhy~LB-znHAu!0)^Q_lwu
diff --git a/hwanyoung2/Content/Illusions/.cache/{8f1e7d26-73b7-4fd0-b70d-d621062ebc01}.pdc b/hwanyoung2/Content/Illusions/.cache/{8f1e7d26-73b7-4fd0-b70d-d621062ebc01}.pdc
index 84baca6aedee4162665636424848e7c91dc1257d..6905169f7a7ff7ace7ead0476ddb67ce9cb73080 100644
GIT binary patch
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^k@Pcm;5(2xNDPl*L=
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^m(FUM^Z(2xNDQGNx_
diff --git a/hwanyoung2/Content/Illusions/.cache/{9320f236-2680-4849-a8b0-e89d8e97eb9b}.pdc b/hwanyoung2/Content/Illusions/.cache/{9320f236-2680-4849-a8b0-e89d8e97eb9b}.pdc
index 41f301a180fd5c21e21107126e5495a4bca20c6f..22c64226338d1a95ca718b0cb808f044f02aa5c2 100644
GIT binary patch
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^k@Pcm;5(2xNDPl*L=
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^m(FUM^Z(2xNDQGNx_
diff --git a/hwanyoung2/Content/Illusions/.cache/{b1767621-0ae0-475c-8f68-0acbb39c8ab5}.pdc b/hwanyoung2/Content/Illusions/.cache/{b1767621-0ae0-475c-8f68-0acbb39c8ab5}.pdc
index 5d940ed34ab383dced412e8528c873599f81451f..27a3fb852079a89bbefcb2415a9f8699f441cd34 100644
GIT binary patch
delta 25
fcmdlXvO`3`!^Jy*fq{Vuhy^k@Pcm;5(BJ|9NdE;A
delta 25
fcmdlXvO`3`!^Jy*fq{Vuhy~LB-znHApuq(IQbY!a
diff --git a/hwanyoung2/Content/Illusions/.cache/{c7c66cb4-26fb-49bf-919f-8fb5a757e10a}.pdc b/hwanyoung2/Content/Illusions/.cache/{c7c66cb4-26fb-49bf-919f-8fb5a757e10a}.pdc
index ebad7871929af03b237734a9537d3ffca211aada..ffe6654b76d37f1caec3eb2fbfb9e66d97c2f249 100644
GIT binary patch
delta 25
ecmeBB>`)Z&aPbacU|?VZVu1|Klgt|hDg*#R`voEZ
delta 25
fcmeBB>`)Z&aPbacU|?VZVuAGkcM3KNR0se7Oh5*g
diff --git a/hwanyoung2/Content/Illusions/.cache/{d6fa3d66-6061-46d9-a4a9-b2b12b49d71b}.pdc b/hwanyoung2/Content/Illusions/.cache/{d6fa3d66-6061-46d9-a4a9-b2b12b49d71b}.pdc
index 8bef7751356dd07eeffb873b7b58b0feb2a189cf..ffb96a2a165c10d5208d3252291c7f9876539120 100644
GIT binary patch
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^k@Pcm;5(2xNDPl*L=
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^m(FUM^Z(2xNDQGNx_
diff --git a/hwanyoung2/Content/Illusions/.cache/{eb42c67b-328e-4f48-9cf4-86f7f8606e26}.pdc b/hwanyoung2/Content/Illusions/.cache/{eb42c67b-328e-4f48-9cf4-86f7f8606e26}.pdc
index 96998c748ed09e5f29657f21560dfa8497a529ca..383ca3f603634679aed3db3adf5014859b68d593 100644
GIT binary patch
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^k@Pcm;5(2xNDPl*L=
delta 25
fcmdmCvBN^Z!^Jy*fq{Vuhy^m(FUM^Z(2xNDQGNx_
diff --git a/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml
new file mode 100644
index 00000000..499a839a
--- /dev/null
+++ b/hwanyoung2/Content/Illusions/.unsaved/.user/Metadata/Asset/{4f34473d-1e56-44db-8dd1-60284d90f95e}.user.xml
@@ -0,0 +1,4 @@
+
+