Merge branch 'main' into log-levels

CMakeLists.txt

@@ -237,7 +237,7 @@ endif()
 
 set(MAT_JSON_AS_INTERFACE ON)
 CPMAddPackage("gh:geode-sdk/[email protected]")
-CPMAddPackage("gh:geode-sdk/json@3.1.5")
+CPMAddPackage("gh:geode-sdk/json@3.2.0")
 CPMAddPackage("gh:fmtlib/fmt#11.0.2")
 
 target_compile_definitions(${PROJECT_NAME} INTERFACE MAT_JSON_DYNAMIC=1)
@@ -332,7 +332,6 @@ elseif (EXISTS ${GEODE_PLATFORM_BIN_PATH})
 else()
 	message(FATAL_ERROR
 		"No valid loader binary to link to! Install pre-built binaries with `geode sdk install-binaries`, "
-		"or build Geode from source and add `set(GEODE_LINK_NIGHTLY ON)` to your CMakeLists.txt "
-		"in the line before calling add_subdirectory for Geode."
+		"or build Geode from source."
 	)
 endif()

loader/include/Geode/Loader.hpp

@@ -5,6 +5,7 @@
 #include "loader/Log.hpp"
 #include "loader/Mod.hpp"
 #include "loader/ModEvent.hpp"
+#include "loader/EventV2.hpp"
 #include "loader/Setting.hpp"
 #include "loader/Dirs.hpp"
 

loader/include/Geode/c++stl/gnustl/stl_algobase.h

@@ -990,7 +990,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
       __glibcxx_requires_partitioned_lower(__first, __last, __val);
 
-      return std::__lower_bound(__first, __last, __val,
+      return geode::stl::__lower_bound(__first, __last, __val,
 				__gnu_cxx::__ops::__iter_less_val());
     }