7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge 0ade7a7b86 into 0e8d4c60bc

Browse source
This commit is contained in:
slideglide 2024-11-15 16:26:04 +11:00 committed by GitHub
commit 66c7914a3e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
loader/include/Geode/cocos/support/zip_support/ZipUtils.h vendored
View file

@ -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

4
loader/include/Geode/utils/Task.hpp
View file

@ -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>;
};
};

4
loader/include/Geode/utils/cocos.hpp
View file

@ -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);

4
loader/src/loader/LoaderImpl.cpp
View file

@ -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
}
}

2
loader/src/server/DownloadManager.cpp
View file

@ -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