Cherry picking by hand

ASpoonPlaysGames · Dec 21, 2023 · 115153c · 115153c
1 parent 210dab2
commit 115153c
Show file tree

Hide file tree

Showing 299 changed files with 53 additions and 36 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,11 @@
 [submodule "thirdparty/libcurl"]
-	path = thirdparty/libcurl
+	path = primedev/thirdparty/libcurl
 	url = https://github.com/curl/curl
 	ignore = untracked
 [submodule "thirdparty/minhook"]
-	path = thirdparty/minhook
+	path = primedev/thirdparty/minhook
 	url = https://github.com/TsudaKageyu/minhook
 	ignore = untracked
 [submodule "thirdparty/minizip"]
-	path = thirdparty/minizip
+	path = primedev/thirdparty/minizip
 	url = https://github.com/zlib-ng/minizip-ng.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,10 +24,11 @@ set(NS_BINARY_DIR ${CMAKE_BINARY_DIR}/game)
 message(STATUS "NS: Building to ${NS_BINARY_DIR}")
 
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/primedev/cmake")
 include(utils)
 
+include_directories(primedev)
+include_directories(primedev/thirdparty)
+
 # Targets
-add_subdirectory(loader_wsock32_proxy)
-add_subdirectory(NorthstarDLL)
-add_subdirectory(NorthstarLauncher)
+add_subdirectory(primedev)
diff --git a/cmake/Findminhook.cmake b/cmake/Findminhook.cmake
diff --git a/cmake/Findspdlog.cmake b/cmake/Findspdlog.cmake
diff --git a/primedev/CMakeLists.txt b/primedev/CMakeLists.txt
@@ -0,0 +1,3 @@
+include(Northstar.cmake)
+include(Launcher.cmake)
+include(WSockProxy.cmake)
diff --git a/NorthstarLauncher/CMakeLists.txt → primedev/Launcher.cmake b/NorthstarLauncher/CMakeLists.txt → primedev/Launcher.cmake
@@ -1,8 +1,8 @@
 # NorthstarLauncher
 
 add_executable(NorthstarLauncher
-               "main.cpp"
-               "resources.rc"
+               "primelauncher/main.cpp"
+               "primelauncher/resources.rc"
 )
 
 target_compile_definitions(NorthstarLauncher PRIVATE

diff --git a/NorthstarDLL/CMakeLists.txt → primedev/Northstar.cmake b/NorthstarDLL/CMakeLists.txt → primedev/Northstar.cmake
@@ -167,11 +167,6 @@ target_link_libraries(NorthstarDLL PRIVATE
                       version.lib
 )
 
-target_include_directories(NorthstarDLL PRIVATE
-                           ${CMAKE_SOURCE_DIR}/NorthstarDLL
-                           ${CMAKE_SOURCE_DIR}/thirdparty
-)
-
 target_precompile_headers(NorthstarDLL PRIVATE pch.h)
 
 target_compile_definitions(NorthstarDLL PRIVATE

diff --git a/loader_wsock32_proxy/CMakeLists.txt → primedev/WSockProxy.cmake b/loader_wsock32_proxy/CMakeLists.txt → primedev/WSockProxy.cmake
@@ -3,11 +3,11 @@
 find_package(minhook REQUIRED)
 
 add_library(loader_wsock32_proxy SHARED
-            "dllmain.cpp"
-            "loader.cpp"
-            "loader.h"
-            "wsock32.asm"
-            "wsock32.def"
+            "wsockproxy/dllmain.cpp"
+            "wsockproxy/loader.cpp"
+            "wsockproxy/loader.h"
+            "wsockproxy/wsock32.asm"
+            "wsockproxy/wsock32.def"
 )
 
 target_link_libraries(loader_wsock32_proxy PRIVATE
@@ -31,7 +31,7 @@ target_link_libraries(loader_wsock32_proxy PRIVATE
                       odbccp32.lib
 )
 
-target_precompile_headers(loader_wsock32_proxy PRIVATE pch.h)
+target_precompile_headers(loader_wsock32_proxy PRIVATE wsockproxy/pch.h)
 
 target_compile_definitions(loader_wsock32_proxy PRIVATE
                            UNICODE

diff --git a/NorthstarDLL/client/audio.cpp → primedev/client/audio.cpp b/NorthstarDLL/client/audio.cpp → primedev/client/audio.cpp
diff --git a/NorthstarDLL/client/audio.h → primedev/client/audio.h b/NorthstarDLL/client/audio.h → primedev/client/audio.h
diff --git a/NorthstarDLL/client/chatcommand.cpp → primedev/client/chatcommand.cpp b/NorthstarDLL/client/chatcommand.cpp → primedev/client/chatcommand.cpp
diff --git a/NorthstarDLL/client/clientauthhooks.cpp → primedev/client/clientauthhooks.cpp b/NorthstarDLL/client/clientauthhooks.cpp → primedev/client/clientauthhooks.cpp
diff --git a/NorthstarDLL/client/clientruihooks.cpp → primedev/client/clientruihooks.cpp b/NorthstarDLL/client/clientruihooks.cpp → primedev/client/clientruihooks.cpp
diff --git a/NorthstarDLL/client/clientvideooverrides.cpp → primedev/client/clientvideooverrides.cpp b/NorthstarDLL/client/clientvideooverrides.cpp → primedev/client/clientvideooverrides.cpp
diff --git a/NorthstarDLL/client/debugoverlay.cpp → primedev/client/debugoverlay.cpp b/NorthstarDLL/client/debugoverlay.cpp → primedev/client/debugoverlay.cpp
diff --git a/NorthstarDLL/client/demofixes.cpp → primedev/client/demofixes.cpp b/NorthstarDLL/client/demofixes.cpp → primedev/client/demofixes.cpp
diff --git a/NorthstarDLL/client/diskvmtfixes.cpp → primedev/client/diskvmtfixes.cpp b/NorthstarDLL/client/diskvmtfixes.cpp → primedev/client/diskvmtfixes.cpp
diff --git a/NorthstarDLL/client/languagehooks.cpp → primedev/client/languagehooks.cpp b/NorthstarDLL/client/languagehooks.cpp → primedev/client/languagehooks.cpp
diff --git a/NorthstarDLL/client/latencyflex.cpp → primedev/client/latencyflex.cpp b/NorthstarDLL/client/latencyflex.cpp → primedev/client/latencyflex.cpp
diff --git a/NorthstarDLL/client/localchatwriter.cpp → primedev/client/localchatwriter.cpp b/NorthstarDLL/client/localchatwriter.cpp → primedev/client/localchatwriter.cpp
diff --git a/NorthstarDLL/client/localchatwriter.h → primedev/client/localchatwriter.h b/NorthstarDLL/client/localchatwriter.h → primedev/client/localchatwriter.h
diff --git a/NorthstarDLL/client/modlocalisation.cpp → primedev/client/modlocalisation.cpp b/NorthstarDLL/client/modlocalisation.cpp → primedev/client/modlocalisation.cpp
diff --git a/NorthstarDLL/client/r2client.cpp → primedev/client/r2client.cpp b/NorthstarDLL/client/r2client.cpp → primedev/client/r2client.cpp
diff --git a/NorthstarDLL/client/r2client.h → primedev/client/r2client.h b/NorthstarDLL/client/r2client.h → primedev/client/r2client.h
diff --git a/...hstarDLL/client/rejectconnectionfixes.cpp → primedev/client/rejectconnectionfixes.cpp b/...hstarDLL/client/rejectconnectionfixes.cpp → primedev/client/rejectconnectionfixes.cpp
diff --git a/primedev/cmake/Findlibcurl.cmake b/primedev/cmake/Findlibcurl.cmake
@@ -0,0 +1,18 @@
+
+
+if (NOT libcurl_FOUND)
+	check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/libcurl)
+
+	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
+	set(BUILD_CURL_EXE OFF CACHE BOOL "Build curl EXE")
+	set(HTTP_ONLY ON CACHE BOOL "Only build HTTP and HTTPS")
+	set(CURL_ENABLE_SSL ON CACHE BOOL "Enable SSL support")
+	set(CURL_USE_OPENSSL OFF CACHE BOOL "Disable OpenSSL")
+	set(CURL_USE_LIBSSH2 OFF CACHE BOOL "Disable libSSH2")
+	set(CURL_USE_SCHANNEL ON CACHE BOOL "Enable Secure Channel")
+	set(CURL_CA_BUNDLE "none" CACHE STRING "Disable CA Bundle")
+	set(CURL_CA_PATH "none" CACHE STRING "Disable CA Path")
+
+	add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/libcurl libcurl)
+	set(libcurl_FOUND 1 PARENT_SCOPE)
+endif()
diff --git a/primedev/cmake/Findminizip.cmake b/primedev/cmake/Findminizip.cmake
@@ -0,0 +1,16 @@
+
+if(NOT minizip_FOUND)
+	check_init_submodule(${PROJECT_SOURCE_DIR}/thirdparty/minizip)
+
+	set(MZ_ZLIB ON CACHE BOOL "Enable ZLIB compression, needed for DEFLATE")
+	set(MZ_BZIP2 OFF CACHE BOOL "Disable BZIP2 compression")
+	set(MZ_LZMA OFF CACHE BOOL "Disable LZMA & XZ compression")
+	set(MZ_PKCRYPT OFF CACHE BOOL "Disable PKWARE traditional encryption")
+	set(MZ_WZAES OFF CACHE BOOL "Disable WinZIP AES encryption")
+	set(MZ_ZSTD OFF CACHE BOOL "Disable ZSTD compression")
+	set(MZ_SIGNING OFF CACHE BOOL "Disable zip signing support")
+
+	add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/minizip minizip)
+	set(minizip_FOUND 1 PARENT_SCOPE)
+endif()
+
diff --git a/cmake/utils.cmake → primedev/cmake/utils.cmake b/cmake/utils.cmake → primedev/cmake/utils.cmake
diff --git a/NorthstarDLL/config/profile.cpp → primedev/config/profile.cpp b/NorthstarDLL/config/profile.cpp → primedev/config/profile.cpp
diff --git a/NorthstarDLL/config/profile.h → primedev/config/profile.h b/NorthstarDLL/config/profile.h → primedev/config/profile.h
diff --git a/NorthstarDLL/core/convar/concommand.cpp → primedev/core/convar/concommand.cpp b/NorthstarDLL/core/convar/concommand.cpp → primedev/core/convar/concommand.cpp
diff --git a/NorthstarDLL/core/convar/concommand.h → primedev/core/convar/concommand.h b/NorthstarDLL/core/convar/concommand.h → primedev/core/convar/concommand.h
diff --git a/NorthstarDLL/core/convar/convar.cpp → primedev/core/convar/convar.cpp b/NorthstarDLL/core/convar/convar.cpp → primedev/core/convar/convar.cpp
diff --git a/NorthstarDLL/core/convar/convar.h → primedev/core/convar/convar.h b/NorthstarDLL/core/convar/convar.h → primedev/core/convar/convar.h
diff --git a/NorthstarDLL/core/convar/cvar.cpp → primedev/core/convar/cvar.cpp b/NorthstarDLL/core/convar/cvar.cpp → primedev/core/convar/cvar.cpp
diff --git a/NorthstarDLL/core/convar/cvar.h → primedev/core/convar/cvar.h b/NorthstarDLL/core/convar/cvar.h → primedev/core/convar/cvar.h
diff --git a/NorthstarDLL/core/filesystem/filesystem.cpp → primedev/core/filesystem/filesystem.cpp b/NorthstarDLL/core/filesystem/filesystem.cpp → primedev/core/filesystem/filesystem.cpp
diff --git a/NorthstarDLL/core/filesystem/filesystem.h → primedev/core/filesystem/filesystem.h b/NorthstarDLL/core/filesystem/filesystem.h → primedev/core/filesystem/filesystem.h
diff --git a/...tarDLL/core/filesystem/rpakfilesystem.cpp → primedev/core/filesystem/rpakfilesystem.cpp b/...tarDLL/core/filesystem/rpakfilesystem.cpp → primedev/core/filesystem/rpakfilesystem.cpp
diff --git a/...hstarDLL/core/filesystem/rpakfilesystem.h → primedev/core/filesystem/rpakfilesystem.h b/...hstarDLL/core/filesystem/rpakfilesystem.h → primedev/core/filesystem/rpakfilesystem.h
diff --git a/NorthstarDLL/core/hooks.cpp → primedev/core/hooks.cpp b/NorthstarDLL/core/hooks.cpp → primedev/core/hooks.cpp
diff --git a/NorthstarDLL/core/hooks.h → primedev/core/hooks.h b/NorthstarDLL/core/hooks.h → primedev/core/hooks.h
diff --git a/NorthstarDLL/core/macros.h → primedev/core/macros.h b/NorthstarDLL/core/macros.h → primedev/core/macros.h
diff --git a/NorthstarDLL/core/math/bitbuf.h → primedev/core/math/bitbuf.h b/NorthstarDLL/core/math/bitbuf.h → primedev/core/math/bitbuf.h
diff --git a/NorthstarDLL/core/math/bits.cpp → primedev/core/math/bits.cpp b/NorthstarDLL/core/math/bits.cpp → primedev/core/math/bits.cpp
diff --git a/NorthstarDLL/core/math/bits.h → primedev/core/math/bits.h b/NorthstarDLL/core/math/bits.h → primedev/core/math/bits.h
diff --git a/NorthstarDLL/core/math/color.cpp → primedev/core/math/color.cpp b/NorthstarDLL/core/math/color.cpp → primedev/core/math/color.cpp
diff --git a/NorthstarDLL/core/math/color.h → primedev/core/math/color.h b/NorthstarDLL/core/math/color.h → primedev/core/math/color.h
diff --git a/NorthstarDLL/core/math/vector.h → primedev/core/math/vector.h b/NorthstarDLL/core/math/vector.h → primedev/core/math/vector.h
diff --git a/NorthstarDLL/core/memalloc.cpp → primedev/core/memalloc.cpp b/NorthstarDLL/core/memalloc.cpp → primedev/core/memalloc.cpp
diff --git a/NorthstarDLL/core/memalloc.h → primedev/core/memalloc.h b/NorthstarDLL/core/memalloc.h → primedev/core/memalloc.h
diff --git a/NorthstarDLL/core/memory.cpp → primedev/core/memory.cpp b/NorthstarDLL/core/memory.cpp → primedev/core/memory.cpp
diff --git a/NorthstarDLL/core/memory.h → primedev/core/memory.h b/NorthstarDLL/core/memory.h → primedev/core/memory.h
diff --git a/NorthstarDLL/core/sourceinterface.cpp → primedev/core/sourceinterface.cpp b/NorthstarDLL/core/sourceinterface.cpp → primedev/core/sourceinterface.cpp
diff --git a/NorthstarDLL/core/sourceinterface.h → primedev/core/sourceinterface.h b/NorthstarDLL/core/sourceinterface.h → primedev/core/sourceinterface.h
diff --git a/NorthstarDLL/core/structs.h → primedev/core/structs.h b/NorthstarDLL/core/structs.h → primedev/core/structs.h
diff --git a/NorthstarDLL/core/tier0.cpp → primedev/core/tier0.cpp b/NorthstarDLL/core/tier0.cpp → primedev/core/tier0.cpp
diff --git a/NorthstarDLL/core/tier0.h → primedev/core/tier0.h b/NorthstarDLL/core/tier0.h → primedev/core/tier0.h
diff --git a/NorthstarDLL/core/vanilla.h → primedev/core/vanilla.h b/NorthstarDLL/core/vanilla.h → primedev/core/vanilla.h
diff --git a/NorthstarDLL/dedicated/dedicated.cpp → primedev/dedicated/dedicated.cpp b/NorthstarDLL/dedicated/dedicated.cpp → primedev/dedicated/dedicated.cpp
diff --git a/NorthstarDLL/dedicated/dedicated.h → primedev/dedicated/dedicated.h b/NorthstarDLL/dedicated/dedicated.h → primedev/dedicated/dedicated.h
diff --git a/...tarDLL/dedicated/dedicatedlogtoclient.cpp → primedev/dedicated/dedicatedlogtoclient.cpp b/...tarDLL/dedicated/dedicatedlogtoclient.cpp → primedev/dedicated/dedicatedlogtoclient.cpp
diff --git a/...hstarDLL/dedicated/dedicatedlogtoclient.h → primedev/dedicated/dedicatedlogtoclient.h b/...hstarDLL/dedicated/dedicatedlogtoclient.h → primedev/dedicated/dedicatedlogtoclient.h
diff --git a/...DLL/dedicated/dedicatedmaterialsystem.cpp → ...dev/dedicated/dedicatedmaterialsystem.cpp b/...DLL/dedicated/dedicatedmaterialsystem.cpp → ...dev/dedicated/dedicatedmaterialsystem.cpp
diff --git a/NorthstarDLL/dllmain.cpp → primedev/dllmain.cpp b/NorthstarDLL/dllmain.cpp → primedev/dllmain.cpp
diff --git a/NorthstarDLL/dllmain.h → primedev/dllmain.h b/NorthstarDLL/dllmain.h → primedev/dllmain.h
diff --git a/NorthstarDLL/engine/host.cpp → primedev/engine/host.cpp b/NorthstarDLL/engine/host.cpp → primedev/engine/host.cpp
diff --git a/NorthstarDLL/engine/hoststate.cpp → primedev/engine/hoststate.cpp b/NorthstarDLL/engine/hoststate.cpp → primedev/engine/hoststate.cpp
diff --git a/NorthstarDLL/engine/hoststate.h → primedev/engine/hoststate.h b/NorthstarDLL/engine/hoststate.h → primedev/engine/hoststate.h
diff --git a/NorthstarDLL/engine/r2engine.cpp → primedev/engine/r2engine.cpp b/NorthstarDLL/engine/r2engine.cpp → primedev/engine/r2engine.cpp
diff --git a/NorthstarDLL/engine/r2engine.h → primedev/engine/r2engine.h b/NorthstarDLL/engine/r2engine.h → primedev/engine/r2engine.h
diff --git a/NorthstarDLL/engine/runframe.cpp → primedev/engine/runframe.cpp b/NorthstarDLL/engine/runframe.cpp → primedev/engine/runframe.cpp
diff --git a/NorthstarDLL/logging/crashhandler.cpp → primedev/logging/crashhandler.cpp b/NorthstarDLL/logging/crashhandler.cpp → primedev/logging/crashhandler.cpp
diff --git a/NorthstarDLL/logging/crashhandler.h → primedev/logging/crashhandler.h b/NorthstarDLL/logging/crashhandler.h → primedev/logging/crashhandler.h
diff --git a/NorthstarDLL/logging/logging.cpp → primedev/logging/logging.cpp b/NorthstarDLL/logging/logging.cpp → primedev/logging/logging.cpp
diff --git a/NorthstarDLL/logging/logging.h → primedev/logging/logging.h b/NorthstarDLL/logging/logging.h → primedev/logging/logging.h
diff --git a/NorthstarDLL/logging/loghooks.cpp → primedev/logging/loghooks.cpp b/NorthstarDLL/logging/loghooks.cpp → primedev/logging/loghooks.cpp
diff --git a/NorthstarDLL/logging/loghooks.h → primedev/logging/loghooks.h b/NorthstarDLL/logging/loghooks.h → primedev/logging/loghooks.h
diff --git a/NorthstarDLL/logging/sourceconsole.cpp → primedev/logging/sourceconsole.cpp b/NorthstarDLL/logging/sourceconsole.cpp → primedev/logging/sourceconsole.cpp
diff --git a/NorthstarDLL/logging/sourceconsole.h → primedev/logging/sourceconsole.h b/NorthstarDLL/logging/sourceconsole.h → primedev/logging/sourceconsole.h
diff --git a/NorthstarDLL/masterserver/masterserver.cpp → primedev/masterserver/masterserver.cpp b/NorthstarDLL/masterserver/masterserver.cpp → primedev/masterserver/masterserver.cpp
diff --git a/NorthstarDLL/masterserver/masterserver.h → primedev/masterserver/masterserver.h b/NorthstarDLL/masterserver/masterserver.h → primedev/masterserver/masterserver.h
diff --git a/...arDLL/mods/autodownload/moddownloader.cpp → primedev/mods/autodownload/moddownloader.cpp b/...arDLL/mods/autodownload/moddownloader.cpp → primedev/mods/autodownload/moddownloader.cpp
diff --git a/...starDLL/mods/autodownload/moddownloader.h → primedev/mods/autodownload/moddownloader.h b/...starDLL/mods/autodownload/moddownloader.h → primedev/mods/autodownload/moddownloader.h
diff --git a/NorthstarDLL/mods/compiled/kb_act.cpp → primedev/mods/compiled/kb_act.cpp b/NorthstarDLL/mods/compiled/kb_act.cpp → primedev/mods/compiled/kb_act.cpp
diff --git a/NorthstarDLL/mods/compiled/modkeyvalues.cpp → primedev/mods/compiled/modkeyvalues.cpp b/NorthstarDLL/mods/compiled/modkeyvalues.cpp → primedev/mods/compiled/modkeyvalues.cpp
diff --git a/NorthstarDLL/mods/compiled/modpdef.cpp → primedev/mods/compiled/modpdef.cpp b/NorthstarDLL/mods/compiled/modpdef.cpp → primedev/mods/compiled/modpdef.cpp
diff --git a/...hstarDLL/mods/compiled/modscriptsrson.cpp → primedev/mods/compiled/modscriptsrson.cpp b/...hstarDLL/mods/compiled/modscriptsrson.cpp → primedev/mods/compiled/modscriptsrson.cpp
diff --git a/NorthstarDLL/mods/modmanager.cpp → primedev/mods/modmanager.cpp b/NorthstarDLL/mods/modmanager.cpp → primedev/mods/modmanager.cpp
diff --git a/NorthstarDLL/mods/modmanager.h → primedev/mods/modmanager.h b/NorthstarDLL/mods/modmanager.h → primedev/mods/modmanager.h
diff --git a/NorthstarDLL/mods/modsavefiles.cpp → primedev/mods/modsavefiles.cpp b/NorthstarDLL/mods/modsavefiles.cpp → primedev/mods/modsavefiles.cpp
diff --git a/NorthstarDLL/mods/modsavefiles.h → primedev/mods/modsavefiles.h b/NorthstarDLL/mods/modsavefiles.h → primedev/mods/modsavefiles.h
diff --git a/NorthstarDLL/ns_version.h → primedev/ns_version.h b/NorthstarDLL/ns_version.h → primedev/ns_version.h
diff --git a/NorthstarDLL/pch.h → primedev/pch.h b/NorthstarDLL/pch.h → primedev/pch.h
diff --git a/NorthstarDLL/plugins/plugin_abi.h → primedev/plugins/plugin_abi.h b/NorthstarDLL/plugins/plugin_abi.h → primedev/plugins/plugin_abi.h
diff --git a/NorthstarDLL/plugins/pluginbackend.cpp → primedev/plugins/pluginbackend.cpp b/NorthstarDLL/plugins/pluginbackend.cpp → primedev/plugins/pluginbackend.cpp
diff --git a/NorthstarDLL/plugins/pluginbackend.h → primedev/plugins/pluginbackend.h b/NorthstarDLL/plugins/pluginbackend.h → primedev/plugins/pluginbackend.h
diff --git a/NorthstarDLL/plugins/plugins.cpp → primedev/plugins/plugins.cpp b/NorthstarDLL/plugins/plugins.cpp → primedev/plugins/plugins.cpp
diff --git a/NorthstarDLL/plugins/plugins.h → primedev/plugins/plugins.h b/NorthstarDLL/plugins/plugins.h → primedev/plugins/plugins.h
diff --git a/NorthstarLauncher/main.cpp → primedev/primelauncher/main.cpp b/NorthstarLauncher/main.cpp → primedev/primelauncher/main.cpp
diff --git a/NorthstarLauncher/ns_icon.ico → primedev/primelauncher/ns_icon.ico b/NorthstarLauncher/ns_icon.ico → primedev/primelauncher/ns_icon.ico
diff --git a/NorthstarDLL/resource1.h → primedev/primelauncher/resource1.h b/NorthstarDLL/resource1.h → primedev/primelauncher/resource1.h
diff --git a/NorthstarLauncher/resources.rc → primedev/primelauncher/resources.rc b/NorthstarLauncher/resources.rc → primedev/primelauncher/resources.rc
diff --git a/NorthstarLauncher/resource1.h → primedev/resource1.h b/NorthstarLauncher/resource1.h → primedev/resource1.h
diff --git a/NorthstarDLL/resources.rc → primedev/resources.rc b/NorthstarDLL/resources.rc → primedev/resources.rc
diff --git a/...tarDLL/scripts/client/clientchathooks.cpp → primedev/scripts/client/clientchathooks.cpp b/...tarDLL/scripts/client/clientchathooks.cpp → primedev/scripts/client/clientchathooks.cpp
diff --git a/...starDLL/scripts/client/cursorposition.cpp → primedev/scripts/client/cursorposition.cpp b/...starDLL/scripts/client/cursorposition.cpp → primedev/scripts/client/cursorposition.cpp
diff --git a/...DLL/scripts/client/scriptbrowserhooks.cpp → ...dev/scripts/client/scriptbrowserhooks.cpp b/...DLL/scripts/client/scriptbrowserhooks.cpp → ...dev/scripts/client/scriptbrowserhooks.cpp
diff --git a/...L/scripts/client/scriptmainmenupromos.cpp → ...v/scripts/client/scriptmainmenupromos.cpp b/...L/scripts/client/scriptmainmenupromos.cpp → ...v/scripts/client/scriptmainmenupromos.cpp
diff --git a/...hstarDLL/scripts/client/scriptmodmenu.cpp → primedev/scripts/client/scriptmodmenu.cpp b/...hstarDLL/scripts/client/scriptmodmenu.cpp → primedev/scripts/client/scriptmodmenu.cpp
diff --git a/...arDLL/scripts/client/scriptoriginauth.cpp → primedev/scripts/client/scriptoriginauth.cpp b/...arDLL/scripts/client/scriptoriginauth.cpp → primedev/scripts/client/scriptoriginauth.cpp
diff --git a/...LL/scripts/client/scriptserverbrowser.cpp → ...ev/scripts/client/scriptserverbrowser.cpp b/...LL/scripts/client/scriptserverbrowser.cpp → ...ev/scripts/client/scriptserverbrowser.cpp
diff --git a/...ent/scriptservertoclientstringcommand.cpp → ...ent/scriptservertoclientstringcommand.cpp b/...ent/scriptservertoclientstringcommand.cpp → ...ent/scriptservertoclientstringcommand.cpp
diff --git a/NorthstarDLL/scripts/scriptdatatables.cpp → primedev/scripts/scriptdatatables.cpp b/NorthstarDLL/scripts/scriptdatatables.cpp → primedev/scripts/scriptdatatables.cpp
diff --git a/...rDLL/scripts/scripthttprequesthandler.cpp → ...edev/scripts/scripthttprequesthandler.cpp b/...rDLL/scripts/scripthttprequesthandler.cpp → ...edev/scripts/scripthttprequesthandler.cpp
diff --git a/...tarDLL/scripts/scripthttprequesthandler.h → primedev/scripts/scripthttprequesthandler.h b/...tarDLL/scripts/scripthttprequesthandler.h → primedev/scripts/scripthttprequesthandler.h
diff --git a/NorthstarDLL/scripts/scriptjson.cpp → primedev/scripts/scriptjson.cpp b/NorthstarDLL/scripts/scriptjson.cpp → primedev/scripts/scriptjson.cpp
diff --git a/NorthstarDLL/scripts/scriptjson.h → primedev/scripts/scriptjson.h b/NorthstarDLL/scripts/scriptjson.h → primedev/scripts/scriptjson.h
diff --git a/NorthstarDLL/scripts/scriptutility.cpp → primedev/scripts/scriptutility.cpp b/NorthstarDLL/scripts/scriptutility.cpp → primedev/scripts/scriptutility.cpp
diff --git a/...tarDLL/scripts/server/miscserverfixes.cpp → primedev/scripts/server/miscserverfixes.cpp b/...tarDLL/scripts/server/miscserverfixes.cpp → primedev/scripts/server/miscserverfixes.cpp
diff --git a/...arDLL/scripts/server/miscserverscript.cpp → primedev/scripts/server/miscserverscript.cpp b/...arDLL/scripts/server/miscserverscript.cpp → primedev/scripts/server/miscserverscript.cpp
diff --git a/...starDLL/scripts/server/scriptuserinfo.cpp → primedev/scripts/server/scriptuserinfo.cpp b/...starDLL/scripts/server/scriptuserinfo.cpp → primedev/scripts/server/scriptuserinfo.cpp
diff --git a/NorthstarDLL/server/alltalk.cpp → primedev/server/alltalk.cpp b/NorthstarDLL/server/alltalk.cpp → primedev/server/alltalk.cpp
diff --git a/NorthstarDLL/server/auth/bansystem.cpp → primedev/server/auth/bansystem.cpp b/NorthstarDLL/server/auth/bansystem.cpp → primedev/server/auth/bansystem.cpp
diff --git a/NorthstarDLL/server/auth/bansystem.h → primedev/server/auth/bansystem.h b/NorthstarDLL/server/auth/bansystem.h → primedev/server/auth/bansystem.h
diff --git a/...rDLL/server/auth/serverauthentication.cpp → ...edev/server/auth/serverauthentication.cpp b/...rDLL/server/auth/serverauthentication.cpp → ...edev/server/auth/serverauthentication.cpp
diff --git a/...tarDLL/server/auth/serverauthentication.h → primedev/server/auth/serverauthentication.h b/...tarDLL/server/auth/serverauthentication.h → primedev/server/auth/serverauthentication.h
diff --git a/NorthstarDLL/server/buildainfile.cpp → primedev/server/buildainfile.cpp b/NorthstarDLL/server/buildainfile.cpp → primedev/server/buildainfile.cpp
diff --git a/NorthstarDLL/server/r2server.cpp → primedev/server/r2server.cpp b/NorthstarDLL/server/r2server.cpp → primedev/server/r2server.cpp
diff --git a/NorthstarDLL/server/r2server.h → primedev/server/r2server.h b/NorthstarDLL/server/r2server.h → primedev/server/r2server.h
diff --git a/NorthstarDLL/server/serverchathooks.cpp → primedev/server/serverchathooks.cpp b/NorthstarDLL/server/serverchathooks.cpp → primedev/server/serverchathooks.cpp
diff --git a/NorthstarDLL/server/serverchathooks.h → primedev/server/serverchathooks.h b/NorthstarDLL/server/serverchathooks.h → primedev/server/serverchathooks.h
diff --git a/NorthstarDLL/server/servernethooks.cpp → primedev/server/servernethooks.cpp b/NorthstarDLL/server/servernethooks.cpp → primedev/server/servernethooks.cpp
diff --git a/NorthstarDLL/server/serverpresence.cpp → primedev/server/serverpresence.cpp b/NorthstarDLL/server/serverpresence.cpp → primedev/server/serverpresence.cpp
diff --git a/NorthstarDLL/server/serverpresence.h → primedev/server/serverpresence.h b/NorthstarDLL/server/serverpresence.h → primedev/server/serverpresence.h
diff --git a/...DLL/shared/exploit_fixes/exploitfixes.cpp → ...dev/shared/exploit_fixes/exploitfixes.cpp b/...DLL/shared/exploit_fixes/exploitfixes.cpp → ...dev/shared/exploit_fixes/exploitfixes.cpp
diff --git a/...hared/exploit_fixes/exploitfixes_lzss.cpp → ...hared/exploit_fixes/exploitfixes_lzss.cpp b/...hared/exploit_fixes/exploitfixes_lzss.cpp → ...hared/exploit_fixes/exploitfixes_lzss.cpp
diff --git a/...exploit_fixes/exploitfixes_utf8parser.cpp → ...exploit_fixes/exploitfixes_utf8parser.cpp b/...exploit_fixes/exploitfixes_utf8parser.cpp → ...exploit_fixes/exploitfixes_utf8parser.cpp
diff --git a/...tarDLL/shared/exploit_fixes/ns_limits.cpp → primedev/shared/exploit_fixes/ns_limits.cpp b/...tarDLL/shared/exploit_fixes/ns_limits.cpp → primedev/shared/exploit_fixes/ns_limits.cpp
diff --git a/...hstarDLL/shared/exploit_fixes/ns_limits.h → primedev/shared/exploit_fixes/ns_limits.h b/...hstarDLL/shared/exploit_fixes/ns_limits.h → primedev/shared/exploit_fixes/ns_limits.h
diff --git a/NorthstarDLL/shared/keyvalues.cpp → primedev/shared/keyvalues.cpp b/NorthstarDLL/shared/keyvalues.cpp → primedev/shared/keyvalues.cpp
diff --git a/NorthstarDLL/shared/keyvalues.h → primedev/shared/keyvalues.h b/NorthstarDLL/shared/keyvalues.h → primedev/shared/keyvalues.h
diff --git a/NorthstarDLL/shared/maxplayers.cpp → primedev/shared/maxplayers.cpp b/NorthstarDLL/shared/maxplayers.cpp → primedev/shared/maxplayers.cpp
diff --git a/NorthstarDLL/shared/maxplayers.h → primedev/shared/maxplayers.h b/NorthstarDLL/shared/maxplayers.h → primedev/shared/maxplayers.h
diff --git a/NorthstarDLL/shared/misccommands.cpp → primedev/shared/misccommands.cpp b/NorthstarDLL/shared/misccommands.cpp → primedev/shared/misccommands.cpp
diff --git a/NorthstarDLL/shared/misccommands.h → primedev/shared/misccommands.h b/NorthstarDLL/shared/misccommands.h → primedev/shared/misccommands.h
diff --git a/NorthstarDLL/shared/playlist.cpp → primedev/shared/playlist.cpp b/NorthstarDLL/shared/playlist.cpp → primedev/shared/playlist.cpp
diff --git a/NorthstarDLL/shared/playlist.h → primedev/shared/playlist.h b/NorthstarDLL/shared/playlist.h → primedev/shared/playlist.h
diff --git a/NorthstarDLL/squirrel/squirrel.cpp → primedev/squirrel/squirrel.cpp b/NorthstarDLL/squirrel/squirrel.cpp → primedev/squirrel/squirrel.cpp
diff --git a/NorthstarDLL/squirrel/squirrel.h → primedev/squirrel/squirrel.h b/NorthstarDLL/squirrel/squirrel.h → primedev/squirrel/squirrel.h
diff --git a/NorthstarDLL/squirrel/squirrelautobind.cpp → primedev/squirrel/squirrelautobind.cpp b/NorthstarDLL/squirrel/squirrelautobind.cpp → primedev/squirrel/squirrelautobind.cpp
diff --git a/NorthstarDLL/squirrel/squirrelautobind.h → primedev/squirrel/squirrelautobind.h b/NorthstarDLL/squirrel/squirrelautobind.h → primedev/squirrel/squirrelautobind.h
diff --git a/NorthstarDLL/squirrel/squirrelclasstypes.h → primedev/squirrel/squirrelclasstypes.h b/NorthstarDLL/squirrel/squirrelclasstypes.h → primedev/squirrel/squirrelclasstypes.h
diff --git a/NorthstarDLL/squirrel/squirreldatatypes.h → primedev/squirrel/squirreldatatypes.h b/NorthstarDLL/squirrel/squirreldatatypes.h → primedev/squirrel/squirreldatatypes.h
diff --git a/thirdparty/libcurl → primedev/thirdparty/libcurl b/thirdparty/libcurl → primedev/thirdparty/libcurl
diff --git a/thirdparty/minhook → primedev/thirdparty/minhook b/thirdparty/minhook → primedev/thirdparty/minhook
diff --git a/thirdparty/minizip → primedev/thirdparty/minizip b/thirdparty/minizip → primedev/thirdparty/minizip
diff --git a/thirdparty/rapidjson/allocators.h → primedev/thirdparty/rapidjson/allocators.h b/thirdparty/rapidjson/allocators.h → primedev/thirdparty/rapidjson/allocators.h
diff --git a/thirdparty/rapidjson/document.h → primedev/thirdparty/rapidjson/document.h b/thirdparty/rapidjson/document.h → primedev/thirdparty/rapidjson/document.h
diff --git a/thirdparty/rapidjson/encodedstream.h → ...edev/thirdparty/rapidjson/encodedstream.h b/thirdparty/rapidjson/encodedstream.h → ...edev/thirdparty/rapidjson/encodedstream.h
diff --git a/thirdparty/rapidjson/encodings.h → primedev/thirdparty/rapidjson/encodings.h b/thirdparty/rapidjson/encodings.h → primedev/thirdparty/rapidjson/encodings.h
diff --git a/thirdparty/rapidjson/error/en.h → primedev/thirdparty/rapidjson/error/en.h b/thirdparty/rapidjson/error/en.h → primedev/thirdparty/rapidjson/error/en.h
diff --git a/thirdparty/rapidjson/error/error.h → primedev/thirdparty/rapidjson/error/error.h b/thirdparty/rapidjson/error/error.h → primedev/thirdparty/rapidjson/error/error.h
diff --git a/thirdparty/rapidjson/filereadstream.h → ...dev/thirdparty/rapidjson/filereadstream.h b/thirdparty/rapidjson/filereadstream.h → ...dev/thirdparty/rapidjson/filereadstream.h
diff --git a/thirdparty/rapidjson/filewritestream.h → ...ev/thirdparty/rapidjson/filewritestream.h b/thirdparty/rapidjson/filewritestream.h → ...ev/thirdparty/rapidjson/filewritestream.h
diff --git a/thirdparty/rapidjson/fwd.h → primedev/thirdparty/rapidjson/fwd.h b/thirdparty/rapidjson/fwd.h → primedev/thirdparty/rapidjson/fwd.h
diff --git a/thirdparty/rapidjson/internal/biginteger.h → ...hirdparty/rapidjson/internal/biginteger.h b/thirdparty/rapidjson/internal/biginteger.h → ...hirdparty/rapidjson/internal/biginteger.h
diff --git a/thirdparty/rapidjson/internal/diyfp.h → ...dev/thirdparty/rapidjson/internal/diyfp.h b/thirdparty/rapidjson/internal/diyfp.h → ...dev/thirdparty/rapidjson/internal/diyfp.h
diff --git a/thirdparty/rapidjson/internal/dtoa.h → ...edev/thirdparty/rapidjson/internal/dtoa.h b/thirdparty/rapidjson/internal/dtoa.h → ...edev/thirdparty/rapidjson/internal/dtoa.h
diff --git a/thirdparty/rapidjson/internal/ieee754.h → ...v/thirdparty/rapidjson/internal/ieee754.h b/thirdparty/rapidjson/internal/ieee754.h → ...v/thirdparty/rapidjson/internal/ieee754.h
diff --git a/thirdparty/rapidjson/internal/itoa.h → ...edev/thirdparty/rapidjson/internal/itoa.h b/thirdparty/rapidjson/internal/itoa.h → ...edev/thirdparty/rapidjson/internal/itoa.h
diff --git a/thirdparty/rapidjson/internal/meta.h → ...edev/thirdparty/rapidjson/internal/meta.h b/thirdparty/rapidjson/internal/meta.h → ...edev/thirdparty/rapidjson/internal/meta.h
diff --git a/thirdparty/rapidjson/internal/pow10.h → ...dev/thirdparty/rapidjson/internal/pow10.h b/thirdparty/rapidjson/internal/pow10.h → ...dev/thirdparty/rapidjson/internal/pow10.h
diff --git a/thirdparty/rapidjson/internal/regex.h → ...dev/thirdparty/rapidjson/internal/regex.h b/thirdparty/rapidjson/internal/regex.h → ...dev/thirdparty/rapidjson/internal/regex.h
diff --git a/thirdparty/rapidjson/internal/stack.h → ...dev/thirdparty/rapidjson/internal/stack.h b/thirdparty/rapidjson/internal/stack.h → ...dev/thirdparty/rapidjson/internal/stack.h
diff --git a/thirdparty/rapidjson/internal/strfunc.h → ...v/thirdparty/rapidjson/internal/strfunc.h b/thirdparty/rapidjson/internal/strfunc.h → ...v/thirdparty/rapidjson/internal/strfunc.h
diff --git a/thirdparty/rapidjson/internal/strtod.h → ...ev/thirdparty/rapidjson/internal/strtod.h b/thirdparty/rapidjson/internal/strtod.h → ...ev/thirdparty/rapidjson/internal/strtod.h
diff --git a/thirdparty/rapidjson/internal/swap.h → ...edev/thirdparty/rapidjson/internal/swap.h b/thirdparty/rapidjson/internal/swap.h → ...edev/thirdparty/rapidjson/internal/swap.h
diff --git a/thirdparty/rapidjson/istreamwrapper.h → ...dev/thirdparty/rapidjson/istreamwrapper.h b/thirdparty/rapidjson/istreamwrapper.h → ...dev/thirdparty/rapidjson/istreamwrapper.h
diff --git a/thirdparty/rapidjson/memorybuffer.h → primedev/thirdparty/rapidjson/memorybuffer.h b/thirdparty/rapidjson/memorybuffer.h → primedev/thirdparty/rapidjson/memorybuffer.h
diff --git a/thirdparty/rapidjson/memorystream.h → primedev/thirdparty/rapidjson/memorystream.h b/thirdparty/rapidjson/memorystream.h → primedev/thirdparty/rapidjson/memorystream.h
diff --git a/thirdparty/rapidjson/msinttypes/inttypes.h → ...hirdparty/rapidjson/msinttypes/inttypes.h b/thirdparty/rapidjson/msinttypes/inttypes.h → ...hirdparty/rapidjson/msinttypes/inttypes.h
diff --git a/thirdparty/rapidjson/msinttypes/stdint.h → .../thirdparty/rapidjson/msinttypes/stdint.h b/thirdparty/rapidjson/msinttypes/stdint.h → .../thirdparty/rapidjson/msinttypes/stdint.h
diff --git a/thirdparty/rapidjson/ostreamwrapper.h → ...dev/thirdparty/rapidjson/ostreamwrapper.h b/thirdparty/rapidjson/ostreamwrapper.h → ...dev/thirdparty/rapidjson/ostreamwrapper.h
diff --git a/thirdparty/rapidjson/pointer.h → primedev/thirdparty/rapidjson/pointer.h b/thirdparty/rapidjson/pointer.h → primedev/thirdparty/rapidjson/pointer.h
diff --git a/thirdparty/rapidjson/prettywriter.h → primedev/thirdparty/rapidjson/prettywriter.h b/thirdparty/rapidjson/prettywriter.h → primedev/thirdparty/rapidjson/prettywriter.h
diff --git a/thirdparty/rapidjson/rapidjson.h → primedev/thirdparty/rapidjson/rapidjson.h b/thirdparty/rapidjson/rapidjson.h → primedev/thirdparty/rapidjson/rapidjson.h
diff --git a/thirdparty/rapidjson/reader.h → primedev/thirdparty/rapidjson/reader.h b/thirdparty/rapidjson/reader.h → primedev/thirdparty/rapidjson/reader.h
diff --git a/thirdparty/rapidjson/schema.h → primedev/thirdparty/rapidjson/schema.h b/thirdparty/rapidjson/schema.h → primedev/thirdparty/rapidjson/schema.h
diff --git a/thirdparty/rapidjson/stream.h → primedev/thirdparty/rapidjson/stream.h b/thirdparty/rapidjson/stream.h → primedev/thirdparty/rapidjson/stream.h
diff --git a/thirdparty/rapidjson/stringbuffer.h → primedev/thirdparty/rapidjson/stringbuffer.h b/thirdparty/rapidjson/stringbuffer.h → primedev/thirdparty/rapidjson/stringbuffer.h
diff --git a/thirdparty/rapidjson/writer.h → primedev/thirdparty/rapidjson/writer.h b/thirdparty/rapidjson/writer.h → primedev/thirdparty/rapidjson/writer.h
diff --git a/thirdparty/spdlog/async.h → primedev/thirdparty/spdlog/async.h b/thirdparty/spdlog/async.h → primedev/thirdparty/spdlog/async.h
diff --git a/thirdparty/spdlog/async_logger-inl.h → ...edev/thirdparty/spdlog/async_logger-inl.h b/thirdparty/spdlog/async_logger-inl.h → ...edev/thirdparty/spdlog/async_logger-inl.h
diff --git a/thirdparty/spdlog/async_logger.h → primedev/thirdparty/spdlog/async_logger.h b/thirdparty/spdlog/async_logger.h → primedev/thirdparty/spdlog/async_logger.h
diff --git a/thirdparty/spdlog/cfg/argv.h → primedev/thirdparty/spdlog/cfg/argv.h b/thirdparty/spdlog/cfg/argv.h → primedev/thirdparty/spdlog/cfg/argv.h
diff --git a/thirdparty/spdlog/cfg/env.h → primedev/thirdparty/spdlog/cfg/env.h b/thirdparty/spdlog/cfg/env.h → primedev/thirdparty/spdlog/cfg/env.h
diff --git a/thirdparty/spdlog/cfg/helpers-inl.h → primedev/thirdparty/spdlog/cfg/helpers-inl.h b/thirdparty/spdlog/cfg/helpers-inl.h → primedev/thirdparty/spdlog/cfg/helpers-inl.h
diff --git a/thirdparty/spdlog/cfg/helpers.h → primedev/thirdparty/spdlog/cfg/helpers.h b/thirdparty/spdlog/cfg/helpers.h → primedev/thirdparty/spdlog/cfg/helpers.h
diff --git a/thirdparty/spdlog/common-inl.h → primedev/thirdparty/spdlog/common-inl.h b/thirdparty/spdlog/common-inl.h → primedev/thirdparty/spdlog/common-inl.h
diff --git a/thirdparty/spdlog/common.h → primedev/thirdparty/spdlog/common.h b/thirdparty/spdlog/common.h → primedev/thirdparty/spdlog/common.h
diff --git a/thirdparty/spdlog/details/backtracer-inl.h → ...hirdparty/spdlog/details/backtracer-inl.h b/thirdparty/spdlog/details/backtracer-inl.h → ...hirdparty/spdlog/details/backtracer-inl.h
diff --git a/thirdparty/spdlog/details/backtracer.h → ...ev/thirdparty/spdlog/details/backtracer.h b/thirdparty/spdlog/details/backtracer.h → ...ev/thirdparty/spdlog/details/backtracer.h
diff --git a/thirdparty/spdlog/details/circular_q.h → ...ev/thirdparty/spdlog/details/circular_q.h b/thirdparty/spdlog/details/circular_q.h → ...ev/thirdparty/spdlog/details/circular_q.h
diff --git a/thirdparty/spdlog/details/console_globals.h → ...irdparty/spdlog/details/console_globals.h b/thirdparty/spdlog/details/console_globals.h → ...irdparty/spdlog/details/console_globals.h
diff --git a/thirdparty/spdlog/details/file_helper-inl.h → ...irdparty/spdlog/details/file_helper-inl.h b/thirdparty/spdlog/details/file_helper-inl.h → ...irdparty/spdlog/details/file_helper-inl.h
diff --git a/thirdparty/spdlog/details/file_helper.h → ...v/thirdparty/spdlog/details/file_helper.h b/thirdparty/spdlog/details/file_helper.h → ...v/thirdparty/spdlog/details/file_helper.h
diff --git a/thirdparty/spdlog/details/fmt_helper.h → ...ev/thirdparty/spdlog/details/fmt_helper.h b/thirdparty/spdlog/details/fmt_helper.h → ...ev/thirdparty/spdlog/details/fmt_helper.h
diff --git a/thirdparty/spdlog/details/log_msg-inl.h → ...v/thirdparty/spdlog/details/log_msg-inl.h b/thirdparty/spdlog/details/log_msg-inl.h → ...v/thirdparty/spdlog/details/log_msg-inl.h
diff --git a/thirdparty/spdlog/details/log_msg.h → primedev/thirdparty/spdlog/details/log_msg.h b/thirdparty/spdlog/details/log_msg.h → primedev/thirdparty/spdlog/details/log_msg.h
diff --git a/...party/spdlog/details/log_msg_buffer-inl.h → ...party/spdlog/details/log_msg_buffer-inl.h b/...party/spdlog/details/log_msg_buffer-inl.h → ...party/spdlog/details/log_msg_buffer-inl.h
diff --git a/thirdparty/spdlog/details/log_msg_buffer.h → ...hirdparty/spdlog/details/log_msg_buffer.h b/thirdparty/spdlog/details/log_msg_buffer.h → ...hirdparty/spdlog/details/log_msg_buffer.h
diff --git a/thirdparty/spdlog/details/mpmc_blocking_q.h → ...irdparty/spdlog/details/mpmc_blocking_q.h b/thirdparty/spdlog/details/mpmc_blocking_q.h → ...irdparty/spdlog/details/mpmc_blocking_q.h
diff --git a/thirdparty/spdlog/details/null_mutex.h → ...ev/thirdparty/spdlog/details/null_mutex.h b/thirdparty/spdlog/details/null_mutex.h → ...ev/thirdparty/spdlog/details/null_mutex.h
diff --git a/thirdparty/spdlog/details/os-inl.h → primedev/thirdparty/spdlog/details/os-inl.h b/thirdparty/spdlog/details/os-inl.h → primedev/thirdparty/spdlog/details/os-inl.h
diff --git a/thirdparty/spdlog/details/os.h → primedev/thirdparty/spdlog/details/os.h b/thirdparty/spdlog/details/os.h → primedev/thirdparty/spdlog/details/os.h
diff --git a/...arty/spdlog/details/periodic_worker-inl.h → ...arty/spdlog/details/periodic_worker-inl.h b/...arty/spdlog/details/periodic_worker-inl.h → ...arty/spdlog/details/periodic_worker-inl.h
diff --git a/thirdparty/spdlog/details/periodic_worker.h → ...irdparty/spdlog/details/periodic_worker.h b/thirdparty/spdlog/details/periodic_worker.h → ...irdparty/spdlog/details/periodic_worker.h
diff --git a/thirdparty/spdlog/details/registry-inl.h → .../thirdparty/spdlog/details/registry-inl.h b/thirdparty/spdlog/details/registry-inl.h → .../thirdparty/spdlog/details/registry-inl.h
diff --git a/thirdparty/spdlog/details/registry.h → ...edev/thirdparty/spdlog/details/registry.h b/thirdparty/spdlog/details/registry.h → ...edev/thirdparty/spdlog/details/registry.h
diff --git a/...arty/spdlog/details/synchronous_factory.h → ...arty/spdlog/details/synchronous_factory.h b/...arty/spdlog/details/synchronous_factory.h → ...arty/spdlog/details/synchronous_factory.h
diff --git a/...party/spdlog/details/tcp_client-windows.h → ...party/spdlog/details/tcp_client-windows.h b/...party/spdlog/details/tcp_client-windows.h → ...party/spdlog/details/tcp_client-windows.h
diff --git a/thirdparty/spdlog/details/tcp_client.h → ...ev/thirdparty/spdlog/details/tcp_client.h b/thirdparty/spdlog/details/tcp_client.h → ...ev/thirdparty/spdlog/details/tcp_client.h
diff --git a/thirdparty/spdlog/details/thread_pool-inl.h → ...irdparty/spdlog/details/thread_pool-inl.h b/thirdparty/spdlog/details/thread_pool-inl.h → ...irdparty/spdlog/details/thread_pool-inl.h
diff --git a/thirdparty/spdlog/details/thread_pool.h → ...v/thirdparty/spdlog/details/thread_pool.h b/thirdparty/spdlog/details/thread_pool.h → ...v/thirdparty/spdlog/details/thread_pool.h
diff --git a/thirdparty/spdlog/details/windows_include.h → ...irdparty/spdlog/details/windows_include.h b/thirdparty/spdlog/details/windows_include.h → ...irdparty/spdlog/details/windows_include.h
diff --git a/thirdparty/spdlog/fmt/bin_to_hex.h → primedev/thirdparty/spdlog/fmt/bin_to_hex.h b/thirdparty/spdlog/fmt/bin_to_hex.h → primedev/thirdparty/spdlog/fmt/bin_to_hex.h
diff --git a/thirdparty/spdlog/fmt/bundled/LICENSE.rst → ...thirdparty/spdlog/fmt/bundled/LICENSE.rst b/thirdparty/spdlog/fmt/bundled/LICENSE.rst → ...thirdparty/spdlog/fmt/bundled/LICENSE.rst
diff --git a/thirdparty/spdlog/fmt/bundled/chrono.h → ...ev/thirdparty/spdlog/fmt/bundled/chrono.h b/thirdparty/spdlog/fmt/bundled/chrono.h → ...ev/thirdparty/spdlog/fmt/bundled/chrono.h
diff --git a/thirdparty/spdlog/fmt/bundled/color.h → ...dev/thirdparty/spdlog/fmt/bundled/color.h b/thirdparty/spdlog/fmt/bundled/color.h → ...dev/thirdparty/spdlog/fmt/bundled/color.h
diff --git a/thirdparty/spdlog/fmt/bundled/compile.h → ...v/thirdparty/spdlog/fmt/bundled/compile.h b/thirdparty/spdlog/fmt/bundled/compile.h → ...v/thirdparty/spdlog/fmt/bundled/compile.h
diff --git a/thirdparty/spdlog/fmt/bundled/core.h → ...edev/thirdparty/spdlog/fmt/bundled/core.h b/thirdparty/spdlog/fmt/bundled/core.h → ...edev/thirdparty/spdlog/fmt/bundled/core.h
diff --git a/thirdparty/spdlog/fmt/bundled/format-inl.h → ...hirdparty/spdlog/fmt/bundled/format-inl.h b/thirdparty/spdlog/fmt/bundled/format-inl.h → ...hirdparty/spdlog/fmt/bundled/format-inl.h
diff --git a/thirdparty/spdlog/fmt/bundled/format.h → ...ev/thirdparty/spdlog/fmt/bundled/format.h b/thirdparty/spdlog/fmt/bundled/format.h → ...ev/thirdparty/spdlog/fmt/bundled/format.h
diff --git a/thirdparty/spdlog/fmt/bundled/locale.h → ...ev/thirdparty/spdlog/fmt/bundled/locale.h b/thirdparty/spdlog/fmt/bundled/locale.h → ...ev/thirdparty/spdlog/fmt/bundled/locale.h
diff --git a/thirdparty/spdlog/fmt/bundled/os.h → primedev/thirdparty/spdlog/fmt/bundled/os.h b/thirdparty/spdlog/fmt/bundled/os.h → primedev/thirdparty/spdlog/fmt/bundled/os.h
diff --git a/thirdparty/spdlog/fmt/bundled/ostream.h → ...v/thirdparty/spdlog/fmt/bundled/ostream.h b/thirdparty/spdlog/fmt/bundled/ostream.h → ...v/thirdparty/spdlog/fmt/bundled/ostream.h
diff --git a/thirdparty/spdlog/fmt/bundled/posix.h → ...dev/thirdparty/spdlog/fmt/bundled/posix.h b/thirdparty/spdlog/fmt/bundled/posix.h → ...dev/thirdparty/spdlog/fmt/bundled/posix.h
diff --git a/thirdparty/spdlog/fmt/bundled/printf.h → ...ev/thirdparty/spdlog/fmt/bundled/printf.h b/thirdparty/spdlog/fmt/bundled/printf.h → ...ev/thirdparty/spdlog/fmt/bundled/printf.h
diff --git a/thirdparty/spdlog/fmt/bundled/ranges.h → ...ev/thirdparty/spdlog/fmt/bundled/ranges.h b/thirdparty/spdlog/fmt/bundled/ranges.h → ...ev/thirdparty/spdlog/fmt/bundled/ranges.h
diff --git a/thirdparty/spdlog/fmt/chrono.h → primedev/thirdparty/spdlog/fmt/chrono.h b/thirdparty/spdlog/fmt/chrono.h → primedev/thirdparty/spdlog/fmt/chrono.h
diff --git a/thirdparty/spdlog/fmt/fmt.h → primedev/thirdparty/spdlog/fmt/fmt.h b/thirdparty/spdlog/fmt/fmt.h → primedev/thirdparty/spdlog/fmt/fmt.h
diff --git a/thirdparty/spdlog/fmt/ostr.h → primedev/thirdparty/spdlog/fmt/ostr.h b/thirdparty/spdlog/fmt/ostr.h → primedev/thirdparty/spdlog/fmt/ostr.h
diff --git a/thirdparty/spdlog/formatter.h → primedev/thirdparty/spdlog/formatter.h b/thirdparty/spdlog/formatter.h → primedev/thirdparty/spdlog/formatter.h
diff --git a/thirdparty/spdlog/fwd.h → primedev/thirdparty/spdlog/fwd.h b/thirdparty/spdlog/fwd.h → primedev/thirdparty/spdlog/fwd.h
diff --git a/thirdparty/spdlog/logger-inl.h → primedev/thirdparty/spdlog/logger-inl.h b/thirdparty/spdlog/logger-inl.h → primedev/thirdparty/spdlog/logger-inl.h
diff --git a/thirdparty/spdlog/logger.h → primedev/thirdparty/spdlog/logger.h b/thirdparty/spdlog/logger.h → primedev/thirdparty/spdlog/logger.h
diff --git a/thirdparty/spdlog/pattern_formatter-inl.h → ...thirdparty/spdlog/pattern_formatter-inl.h b/thirdparty/spdlog/pattern_formatter-inl.h → ...thirdparty/spdlog/pattern_formatter-inl.h
diff --git a/thirdparty/spdlog/pattern_formatter.h → ...dev/thirdparty/spdlog/pattern_formatter.h b/thirdparty/spdlog/pattern_formatter.h → ...dev/thirdparty/spdlog/pattern_formatter.h
diff --git a/thirdparty/spdlog/sinks/android_sink.h → ...ev/thirdparty/spdlog/sinks/android_sink.h b/thirdparty/spdlog/sinks/android_sink.h → ...ev/thirdparty/spdlog/sinks/android_sink.h
diff --git a/thirdparty/spdlog/sinks/ansicolor_sink-inl.h → ...rdparty/spdlog/sinks/ansicolor_sink-inl.h b/thirdparty/spdlog/sinks/ansicolor_sink-inl.h → ...rdparty/spdlog/sinks/ansicolor_sink-inl.h
diff --git a/thirdparty/spdlog/sinks/ansicolor_sink.h → .../thirdparty/spdlog/sinks/ansicolor_sink.h b/thirdparty/spdlog/sinks/ansicolor_sink.h → .../thirdparty/spdlog/sinks/ansicolor_sink.h
diff --git a/thirdparty/spdlog/sinks/base_sink-inl.h → ...v/thirdparty/spdlog/sinks/base_sink-inl.h b/thirdparty/spdlog/sinks/base_sink-inl.h → ...v/thirdparty/spdlog/sinks/base_sink-inl.h
diff --git a/thirdparty/spdlog/sinks/base_sink.h → primedev/thirdparty/spdlog/sinks/base_sink.h b/thirdparty/spdlog/sinks/base_sink.h → primedev/thirdparty/spdlog/sinks/base_sink.h
diff --git a/...dparty/spdlog/sinks/basic_file_sink-inl.h → ...dparty/spdlog/sinks/basic_file_sink-inl.h b/...dparty/spdlog/sinks/basic_file_sink-inl.h → ...dparty/spdlog/sinks/basic_file_sink-inl.h
diff --git a/thirdparty/spdlog/sinks/basic_file_sink.h → ...thirdparty/spdlog/sinks/basic_file_sink.h b/thirdparty/spdlog/sinks/basic_file_sink.h → ...thirdparty/spdlog/sinks/basic_file_sink.h
diff --git a/thirdparty/spdlog/sinks/daily_file_sink.h → ...thirdparty/spdlog/sinks/daily_file_sink.h b/thirdparty/spdlog/sinks/daily_file_sink.h → ...thirdparty/spdlog/sinks/daily_file_sink.h
diff --git a/thirdparty/spdlog/sinks/dist_sink.h → primedev/thirdparty/spdlog/sinks/dist_sink.h b/thirdparty/spdlog/sinks/dist_sink.h → primedev/thirdparty/spdlog/sinks/dist_sink.h
diff --git a/thirdparty/spdlog/sinks/dup_filter_sink.h → ...thirdparty/spdlog/sinks/dup_filter_sink.h b/thirdparty/spdlog/sinks/dup_filter_sink.h → ...thirdparty/spdlog/sinks/dup_filter_sink.h
diff --git a/thirdparty/spdlog/sinks/hourly_file_sink.h → ...hirdparty/spdlog/sinks/hourly_file_sink.h b/thirdparty/spdlog/sinks/hourly_file_sink.h → ...hirdparty/spdlog/sinks/hourly_file_sink.h
diff --git a/thirdparty/spdlog/sinks/msvc_sink.h → primedev/thirdparty/spdlog/sinks/msvc_sink.h b/thirdparty/spdlog/sinks/msvc_sink.h → primedev/thirdparty/spdlog/sinks/msvc_sink.h
diff --git a/thirdparty/spdlog/sinks/null_sink.h → primedev/thirdparty/spdlog/sinks/null_sink.h b/thirdparty/spdlog/sinks/null_sink.h → primedev/thirdparty/spdlog/sinks/null_sink.h
diff --git a/thirdparty/spdlog/sinks/ostream_sink.h → ...ev/thirdparty/spdlog/sinks/ostream_sink.h b/thirdparty/spdlog/sinks/ostream_sink.h → ...ev/thirdparty/spdlog/sinks/ostream_sink.h
diff --git a/thirdparty/spdlog/sinks/ringbuffer_sink.h → ...thirdparty/spdlog/sinks/ringbuffer_sink.h b/thirdparty/spdlog/sinks/ringbuffer_sink.h → ...thirdparty/spdlog/sinks/ringbuffer_sink.h
diff --git a/...rty/spdlog/sinks/rotating_file_sink-inl.h → ...rty/spdlog/sinks/rotating_file_sink-inl.h b/...rty/spdlog/sinks/rotating_file_sink-inl.h → ...rty/spdlog/sinks/rotating_file_sink-inl.h
diff --git a/thirdparty/spdlog/sinks/rotating_file_sink.h → ...rdparty/spdlog/sinks/rotating_file_sink.h b/thirdparty/spdlog/sinks/rotating_file_sink.h → ...rdparty/spdlog/sinks/rotating_file_sink.h
diff --git a/thirdparty/spdlog/sinks/sink-inl.h → primedev/thirdparty/spdlog/sinks/sink-inl.h b/thirdparty/spdlog/sinks/sink-inl.h → primedev/thirdparty/spdlog/sinks/sink-inl.h
diff --git a/thirdparty/spdlog/sinks/sink.h → primedev/thirdparty/spdlog/sinks/sink.h b/thirdparty/spdlog/sinks/sink.h → primedev/thirdparty/spdlog/sinks/sink.h
diff --git a/...rty/spdlog/sinks/stdout_color_sinks-inl.h → ...rty/spdlog/sinks/stdout_color_sinks-inl.h b/...rty/spdlog/sinks/stdout_color_sinks-inl.h → ...rty/spdlog/sinks/stdout_color_sinks-inl.h
diff --git a/thirdparty/spdlog/sinks/stdout_color_sinks.h → ...rdparty/spdlog/sinks/stdout_color_sinks.h b/thirdparty/spdlog/sinks/stdout_color_sinks.h → ...rdparty/spdlog/sinks/stdout_color_sinks.h
diff --git a/thirdparty/spdlog/sinks/stdout_sinks-inl.h → ...hirdparty/spdlog/sinks/stdout_sinks-inl.h b/thirdparty/spdlog/sinks/stdout_sinks-inl.h → ...hirdparty/spdlog/sinks/stdout_sinks-inl.h
diff --git a/thirdparty/spdlog/sinks/stdout_sinks.h → ...ev/thirdparty/spdlog/sinks/stdout_sinks.h b/thirdparty/spdlog/sinks/stdout_sinks.h → ...ev/thirdparty/spdlog/sinks/stdout_sinks.h
diff --git a/thirdparty/spdlog/sinks/syslog_sink.h → ...dev/thirdparty/spdlog/sinks/syslog_sink.h b/thirdparty/spdlog/sinks/syslog_sink.h → ...dev/thirdparty/spdlog/sinks/syslog_sink.h
diff --git a/thirdparty/spdlog/sinks/systemd_sink.h → ...ev/thirdparty/spdlog/sinks/systemd_sink.h b/thirdparty/spdlog/sinks/systemd_sink.h → ...ev/thirdparty/spdlog/sinks/systemd_sink.h
diff --git a/thirdparty/spdlog/sinks/tcp_sink.h → primedev/thirdparty/spdlog/sinks/tcp_sink.h b/thirdparty/spdlog/sinks/tcp_sink.h → primedev/thirdparty/spdlog/sinks/tcp_sink.h
diff --git a/thirdparty/spdlog/sinks/win_eventlog_sink.h → ...irdparty/spdlog/sinks/win_eventlog_sink.h b/thirdparty/spdlog/sinks/win_eventlog_sink.h → ...irdparty/spdlog/sinks/win_eventlog_sink.h
diff --git a/thirdparty/spdlog/sinks/wincolor_sink-inl.h → ...irdparty/spdlog/sinks/wincolor_sink-inl.h b/thirdparty/spdlog/sinks/wincolor_sink-inl.h → ...irdparty/spdlog/sinks/wincolor_sink-inl.h
diff --git a/thirdparty/spdlog/sinks/wincolor_sink.h → ...v/thirdparty/spdlog/sinks/wincolor_sink.h b/thirdparty/spdlog/sinks/wincolor_sink.h → ...v/thirdparty/spdlog/sinks/wincolor_sink.h
diff --git a/thirdparty/spdlog/spdlog-inl.h → primedev/thirdparty/spdlog/spdlog-inl.h b/thirdparty/spdlog/spdlog-inl.h → primedev/thirdparty/spdlog/spdlog-inl.h
diff --git a/thirdparty/spdlog/spdlog.h → primedev/thirdparty/spdlog/spdlog.h b/thirdparty/spdlog/spdlog.h → primedev/thirdparty/spdlog/spdlog.h
diff --git a/thirdparty/spdlog/stopwatch.h → primedev/thirdparty/spdlog/stopwatch.h b/thirdparty/spdlog/stopwatch.h → primedev/thirdparty/spdlog/stopwatch.h
diff --git a/thirdparty/spdlog/tweakme.h → primedev/thirdparty/spdlog/tweakme.h b/thirdparty/spdlog/tweakme.h → primedev/thirdparty/spdlog/tweakme.h
diff --git a/thirdparty/spdlog/version.h → primedev/thirdparty/spdlog/version.h b/thirdparty/spdlog/version.h → primedev/thirdparty/spdlog/version.h
diff --git a/NorthstarDLL/util/printcommands.cpp → primedev/util/printcommands.cpp b/NorthstarDLL/util/printcommands.cpp → primedev/util/printcommands.cpp
diff --git a/NorthstarDLL/util/printcommands.h → primedev/util/printcommands.h b/NorthstarDLL/util/printcommands.h → primedev/util/printcommands.h
diff --git a/NorthstarDLL/util/printmaps.cpp → primedev/util/printmaps.cpp b/NorthstarDLL/util/printmaps.cpp → primedev/util/printmaps.cpp
diff --git a/NorthstarDLL/util/printmaps.h → primedev/util/printmaps.h b/NorthstarDLL/util/printmaps.h → primedev/util/printmaps.h
diff --git a/NorthstarDLL/util/utils.cpp → primedev/util/utils.cpp b/NorthstarDLL/util/utils.cpp → primedev/util/utils.cpp
diff --git a/NorthstarDLL/util/utils.h → primedev/util/utils.h b/NorthstarDLL/util/utils.h → primedev/util/utils.h
diff --git a/NorthstarDLL/util/version.cpp → primedev/util/version.cpp b/NorthstarDLL/util/version.cpp → primedev/util/version.cpp
diff --git a/NorthstarDLL/util/version.h → primedev/util/version.h b/NorthstarDLL/util/version.h → primedev/util/version.h
diff --git a/NorthstarDLL/util/wininfo.cpp → primedev/util/wininfo.cpp b/NorthstarDLL/util/wininfo.cpp → primedev/util/wininfo.cpp
diff --git a/NorthstarDLL/util/wininfo.h → primedev/util/wininfo.h b/NorthstarDLL/util/wininfo.h → primedev/util/wininfo.h
diff --git a/loader_wsock32_proxy/dllmain.cpp → primedev/wsockproxy/dllmain.cpp b/loader_wsock32_proxy/dllmain.cpp → primedev/wsockproxy/dllmain.cpp
diff --git a/loader_wsock32_proxy/loader.cpp → primedev/wsockproxy/loader.cpp b/loader_wsock32_proxy/loader.cpp → primedev/wsockproxy/loader.cpp
diff --git a/loader_wsock32_proxy/loader.h → primedev/wsockproxy/loader.h b/loader_wsock32_proxy/loader.h → primedev/wsockproxy/loader.h
diff --git a/loader_wsock32_proxy/pch.h → primedev/wsockproxy/pch.h b/loader_wsock32_proxy/pch.h → primedev/wsockproxy/pch.h
diff --git a/loader_wsock32_proxy/wsock32.asm → primedev/wsockproxy/wsock32.asm b/loader_wsock32_proxy/wsock32.asm → primedev/wsockproxy/wsock32.asm
diff --git a/loader_wsock32_proxy/wsock32.def → primedev/wsockproxy/wsock32.def b/loader_wsock32_proxy/wsock32.def → primedev/wsockproxy/wsock32.def