From 9f7023cfd52a0d1f50ae6dce4becacf6f3e38737 Mon Sep 17 00:00:00 2001
From: Behron <behron@luckyrobots.com>
Date: Wed, 9 Apr 2025 12:10:41 -0600
Subject: [PATCH] Workspace.xml changes

re merge conflicts.
---
 .idea/.idea.Luckyrobots/.idea/workspace.xml   |  17 ++++++++++++++---
 .../Win64/UnrealEditor-CPathfinding.dll       |   2 +-
 .../Win64/UnrealEditor-CPathfinding.pdb       |   2 +-
 .../Inc/CPathfinding/UHT/Timestamp            |   8 ++++----
 .../UnrealEditor-CPathfinding.exp             | Bin 50499 -> 50499 bytes
 .../UnrealEditor-CPathfinding.lib             |   2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.idea/.idea.Luckyrobots/.idea/workspace.xml b/.idea/.idea.Luckyrobots/.idea/workspace.xml
index e01a821a..1627bd79 100644
--- a/.idea/.idea.Luckyrobots/.idea/workspace.xml
+++ b/.idea/.idea.Luckyrobots/.idea/workspace.xml
@@ -13,7 +13,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="862165ab-fe98-4004-90e3-0742ed8cf5de" name="Changes" comment="" />
+    <list default="true" id="862165ab-fe98-4004-90e3-0742ed8cf5de" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.Luckyrobots/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.Luckyrobots/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujoco.pdb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.dll" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.dll" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.pdb" beforeDir="false" afterPath="$PROJECT_DIR$/Plugins/LuckyMujoco/Binaries/Win64/UnrealEditor-LuckyMujocoEditor.pdb" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -26,7 +37,7 @@
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="cidr-memory-view://1" root0="FORCE_HIGHLIGHTING" />
+    <setting file="cidr-memory-view://2" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/include/mujoco/mjdata.h" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/Plugins/LuckyMujoco/Source/ThirdParty/Mujoco/include/mujoco/mjtnum.h" root0="SKIP_HIGHLIGHTING" />
   </component>
@@ -180,7 +191,7 @@
       <workItem from="1743998849387" duration="7343000" />
       <workItem from="1744126161743" duration="605000" />
       <workItem from="1744127162882" duration="5232000" />
-      <workItem from="1744156005223" duration="2074000" />
+      <workItem from="1744156005223" duration="4174000" />
     </task>
     <servers />
   </component>
diff --git a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll
index 2be4717c..6e393341 100644
--- a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll
+++ b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2eac24ddf85d073a4403149b9105b2d9ed41a3a1f08470b7bf6f5a0665680f9f
+oid sha256:bb0308b788e2bc77bb1b24e3f1e58d2eee3800f1cc149931b7e13e5d2efa1875
 size 282112
diff --git a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb
index 32e98f73..15631f98 100644
--- a/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb
+++ b/Plugins/CPathfinding/Binaries/Win64/UnrealEditor-CPathfinding.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2681f83f963ea50d1eed41dab5a79e6822c7b03a97d959324f51fb16bb3870d
+oid sha256:06e75bca64b22983b793f9038ca144754a991b93fff3dc6a65d86c4e425d6078
 size 60436480
diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp b/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp
index 5ebfac92..aa2d0ca6 100644
--- a/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp
+++ b/Plugins/CPathfinding/Intermediate/Build/Win64/UnrealEditor/Inc/CPathfinding/UHT/Timestamp
@@ -1,6 +1,6 @@
-D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDefines.h
 D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDynamicObstacle.h
-D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathNode.h
-D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolumeGroundPrio.h
-D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathFindPath.h
 D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolume.h
+D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathVolumeGroundPrio.h
+D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathDefines.h
+D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathFindPath.h
+D:\Projects\luckyworld\luckyworld\Plugins\CPathfinding\Source\CPathfinding\Public\CPathNode.h
diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.exp
index a16d023ce455c85ce495d17fa3049c83bffc674d..1b0964c1b834a3353fe29e4df0486efcfcb13964 100644
GIT binary patch
delta 25
fcmX@y#eBGnnLVYAi6NKk+eG$6W+1gO`^FIfcf1NB

delta 25
fcmX@y#eBGnnLVYAiQ&z(uM^o5nSs>C>>Eb_jCu?<

diff --git a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib
index 71d8ac84..76fcc501 100644
--- a/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib
+++ b/Plugins/CPathfinding/Intermediate/Build/Win64/x64/UnrealEditor/Development/CPathfinding/UnrealEditor-CPathfinding.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf01a64ff5b3c42a37701d45ac680647703263640c64c45f37026eab0f5c26aa
+oid sha256:b1f547d6e724e4fa300e81a16cd9c2d5e9844f3cf9fbe6ad351e03665f25b155
 size 86112