Merge 0ade7a7b86 into f9fed578aa

CMakeLists.txt

@@ -237,7 +237,7 @@ endif()
 
 set(MAT_JSON_AS_INTERFACE ON)
 CPMAddPackage("gh:geode-sdk/result@1.2.1")
-CPMAddPackage("gh:geode-sdk/json@3.0.3")
+CPMAddPackage("gh:geode-sdk/json@3.1.0")
 CPMAddPackage("gh:fmtlib/fmt#11.0.2")
 
 target_compile_definitions(${PROJECT_NAME} INTERFACE MAT_JSON_DYNAMIC=1)

loader/include/Geode/cocos/support/zip_support/ZipUtils.h

@@ -208,9 +208,9 @@ namespace cocos2d
     
         /**
          * Custom function added for geode; returns if the 
-         * zip file was succesfully decoded.
+         * zip file was successfully decoded.
          * 
-         * @return true if the zip was succesfully loaded, 
+         * @return true if the zip was successfully loaded, 
          *         false otherwise.
          * 
          * @since geode v1.0.0

loader/include/Geode/utils/Task.hpp

@@ -95,7 +95,7 @@ namespace geode {
         enum class Status {
             /// The task is still running or waiting to start
             Pending,
-            /// The task has succesfully finished
+            /// The task has successfully finished
             Finished,
             /// The task has been cancelled
             Cancelled,
@@ -1032,4 +1032,4 @@ auto operator co_await(geode::Task<T, P> task) {
 template <class T, class P, class... Args>
 struct std::coroutine_traits<geode::Task<T, P>, Args...> {
     using promise_type = geode::geode_internal::TaskPromise<T, P>;
-};
+};

loader/include/Geode/utils/cocos.hpp

@@ -850,7 +850,7 @@ namespace geode::cocos {
      * @param permissive If true, strings like "f" are considered valid 
      * representations of the color white. Useful for UIs that allow entering 
      * a hex color. Empty strings evaluate to pure white
-     * @returns A ccColor3B if it could be succesfully parsed, or an error 
+     * @returns A ccColor3B if it could be successfully parsed, or an error 
      * indicating the failure reason
      */
     GEODE_DLL Result<cocos2d::ccColor3B> cc3bFromHexString(std::string const& hexValue, bool permissive = false);
@@ -863,7 +863,7 @@ namespace geode::cocos {
      * @param permissive If true, strings like "f" are considered valid 
      * representations of the color white. Useful for UIs that allow entering 
      * a hex color. Empty strings evaluate to pure white
-     * @returns A ccColor4B if it could be succesfully parsed, or an error 
+     * @returns A ccColor4B if it could be successfully parsed, or an error 
      * indicating the failure reason
      */
     GEODE_DLL Result<cocos2d::ccColor4B> cc4bFromHexString(std::string const& hexValue, bool requireAlpha = false, bool permissive = false);

loader/src/loader/LoaderImpl.cpp

@@ -1073,7 +1073,7 @@ void Loader::Impl::installModManuallyFromFile(std::filesystem::path const& path,
         createQuickPopup(
             "Mod Installed",
             fmt::format(
-                "Mod <co>{}</c> has been succesfully installed from file! "
+                "Mod <co>{}</c> has been successfully installed from file! "
                 "<cy>Do you want to delete the original file?</c>",
                 meta.getName()
             ),
@@ -1092,7 +1092,7 @@ void Loader::Impl::installModManuallyFromFile(std::filesystem::path const& path,
                             "OK"
                         )->show();
                     }
-                    // No need to show a confirmation popup if succesful since that's 
+                    // No need to show a confirmation popup if successful since that's 
                     // to be assumed via pressing the button on the previous popup
                 }
             }

loader/src/server/DownloadManager.cpp

@@ -256,7 +256,7 @@ std::optional<ModDownload> ModDownloadManager::startDownload(
     std::optional<DependencyFor> const& dependencyFor,
     std::optional<std::string> const& replacesMod
 ) {
-    // If this mod has already been succesfully downloaded or is currently
+    // If this mod has already been successfully downloaded or is currently
     // being downloaded, return as you can't download multiple versions of the
     // same mod simultaniously, since that wouldn't make sense. I mean the new
     // version would just immediately override to the other one