Merge branch 'master' into linux-port

Wires77 · web-flow · commit 2d6479c61187 · 2026-03-10T13:46:04.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -248,7 +248,6 @@ target_link_libraries(SimpleGraphic
     LuaJIT::LuaJIT
     Microsoft.GSL::GSL
     re2::re2
-    sol2
     Threads::Threads
     WebP::webpdecoder
     ZLIB::ZLIB
diff --git a/engine/render/r_main.cpp b/engine/render/r_main.cpp
@@ -1986,7 +1986,7 @@ void r_renderer_c::DoScreenshot(image_c* i, int type, const char* ext)
 	time_t curTime;
 	time(&curTime);
 	auto ssPath = std::filesystem::u8path(fmt::format(CFG_DATAPATH "Screenshots/{:%m%d%y_%H%M%S}.{}",
-		fmt::localtime(curTime), ext));
+		*std::localtime(&curTime), ext));
 
 	// Make folder if it doesn't exist
 	std::error_code ec;
diff --git a/vcpkg b/vcpkg
@@ -1 +1 @@
-Subproject commit 3d72d8c930e1b6a1b2432b262c61af7d3287dcd0
+Subproject commit 66c0373dc7fca549e5803087b9487edfe3aca0a1
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "builtin",
-    "baseline": "3d72d8c930e1b6a1b2432b262c61af7d3287dcd0"
+    "baseline": "66c0373dc7fca549e5803087b9487edfe3aca0a1"
   },
   "registries": [
     {
