Merge remote-tracking branch 'origin/master'

# Conflicts: # .idea/.idea.FWA_MAIN/.idea/dataSources.xml # FWA_MAIN/bin/FWA_MAIN.dll # FWA_MAIN/bin/FWA_MAIN.pdb # FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache # FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache # FWA_MAIN/obj/Debug/FWA_MAIN.dll # FWA_MAIN/obj/Debug/FWA_MAIN.pdb
2024-03-28 19:15:03 -04:00
parent 6c9b58ab33 bcfba3fb27
commit 437ab80ba2
28 changed files with 1105 additions and 43 deletions
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-45d3d63d138360e7ab73dd1d2eec4fe816552351495d36e6dec0aaff47df2394
+e89e31cdadf20fe7db48ef132bf217873437f194debfb0966ea84327b2ae8615
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.dll
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.dll
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb