Skip to content

Commit

Permalink
Merge branch 'development' into feat/sentry-test
Browse files Browse the repository at this point in the history
  • Loading branch information
mehulmathur001 committed Apr 13, 2024
2 parents c8c02b5 + 9b362cf commit c67dc34
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Expand Up @@ -31,7 +31,7 @@ Don't:
* translate the Mudlet API: functions, events, error messages or constants (e.g. `main` console)
* use numbers in the API - English words are preferred instead
* try to assemble a sentence on the fly - English grammar does not translate into other languages. Present the full sentence to translators instead
* assume English-centric plural forms, other languages do not necessarily have the simple add an "s"/"es" for more/less then the singular case.
* assume English-centric plural forms, other languages do not necessarily have the simple add an "s"/"es" for more/less than the singular case.
* assume universal quote and number punctuation formats. There are languages that use « and » instead of " for "quoting" words or phrases. Qt can provide Locale specific displays of numbers/dates/times.

# Tooltip tips:
Expand Down
2 changes: 1 addition & 1 deletion CI/appveyor.functions.ps1
Expand Up @@ -196,7 +196,7 @@ function InstallCmake() {
}

function InstallMingwGet() {
DownloadFile "https://osdn.net/frs/redir.php?m=rwthaachen&f=mingw%2F68260%2Fmingw-get-0.6.3-mingw32-pre-20170905-1-bin.zip" "mingw-get.zip"
DownloadFile "https://osdn.net/frs/redir.php?m=ipconnect&f=mingw%2F68260%2Fmingw-get-0.6.3-mingw32-pre-20170905-1-bin.zip" "mingw-get.zip"
if (!(Test-Path -Path "C:\MinGW" -PathType Container)) {
Step "Creating MinGW path"
New-Item -Path "C:\MinGW" -ItemType "directory" >> "$logFile" 2>&1
Expand Down
2 changes: 1 addition & 1 deletion src/discord.cpp
Expand Up @@ -535,7 +535,7 @@ QString Discord::deduceGameName(const QString& address)
}

// Returns true in First if this is a MUD we know about (and have an Icon for in
// on the Mudlet Discord erver!) and the deduced name in Second - if the
// on the Mudlet Discord server!) and the deduced name in Second - if the
// first is true.
QPair<bool, QString> Discord::gameIntegrationSupported(const QString& address)
{
Expand Down

0 comments on commit c67dc34

Please sign in to comment.