diff options
| author | TanninOne <seppleviathan@gmx.de> | 2016-12-12 19:58:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 19:58:29 +0100 |
| commit | a3671a5557bbcc11a346bd89027ddc7710eb3104 (patch) | |
| tree | 2805ecfc0e1794bc50a4f9603fa0f625a483e6d0 /src | |
| parent | 5ae681e6d554f4d3b68f13597fad4383e6c54691 (diff) | |
| parent | afa0cb94461ce5a4f9e63af6aaee42105b66a898 (diff) | |
Merge pull request #1031 from LePresidente/new_vfs_library
New vfs library
Diffstat (limited to 'src')
| -rw-r--r-- | src/gameinfoimpl.cpp | 1 | ||||
| -rw-r--r-- | src/instancemanager.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/nexusinterface.cpp | 6 | ||||
| -rw-r--r-- | src/selfupdater.cpp | 2 | ||||
| -rw-r--r-- | src/version.rc | 4 |
6 files changed, 9 insertions, 8 deletions
diff --git a/src/gameinfoimpl.cpp b/src/gameinfoimpl.cpp index 333fd029..61a4c523 100644 --- a/src/gameinfoimpl.cpp +++ b/src/gameinfoimpl.cpp @@ -39,6 +39,7 @@ IGameInfo::Type GameInfoImpl::type() const case GameInfo::TYPE_FALLOUT4: return IGameInfo::TYPE_FALLOUT4;
case GameInfo::TYPE_FALLOUTNV: return IGameInfo::TYPE_FALLOUTNV;
case GameInfo::TYPE_SKYRIM: return IGameInfo::TYPE_SKYRIM;
+ case GameInfo::TYPE_SKYRIMSE: return IGameInfo::TYPE_SKYRIMSE;
default: throw MyException(QObject::tr("invalid game type %1").arg(GameInfo::instance().getType()));
}
}
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp index a9182d52..1b0d0e5b 100644 --- a/src/instancemanager.cpp +++ b/src/instancemanager.cpp @@ -72,7 +72,7 @@ QString InstanceManager::queryInstanceName() const // would be neat if we could take the names from the game plugins but // the required initialization order requires the ini file to be // available *before* we load plugins - dialog.setComboBoxItems({ "Oblivion", "Skyrim", "Fallout 3", + dialog.setComboBoxItems({ "Oblivion", "Skyrim", "SkyrimSE", "Fallout 3", "Fallout NV", "Fallout 4" }); dialog.setComboBoxEditable(true); dialog.setWindowTitle(QObject::tr("Enter Instance Name")); diff --git a/src/main.cpp b/src/main.cpp index 16b6b80f..d14641a4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -149,7 +149,7 @@ static LONG WINAPI MyUnhandledExceptionFilter(struct _EXCEPTION_POINTERS *except if (QMessageBox::question(nullptr, QObject::tr("Woops"),
QObject::tr("ModOrganizer has crashed! "
"Should a diagnostic file be created? "
- "If you send me this file (%1) to sherb@gmx.net, "
+ "If you send me this file (%1) to modorganizer@gmail.com, "
"the bug is a lot more likely to be fixed. "
"Please include a short description of what you were "
"doing when the crash happened"
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp index 6e989b0d..eba02a6f 100644 --- a/src/nexusinterface.cpp +++ b/src/nexusinterface.cpp @@ -252,12 +252,12 @@ bool NexusInterface::isURLGameRelated(const QUrl &url) const QString NexusInterface::getGameURL() const
{
- return "http://www.nexusmods.com/" + m_Game->gameShortName().toLower();
+ return "http://www.nexusmods.com/" + m_Game->gameNexusName().toLower();
}
QString NexusInterface::getOldModsURL() const
{
- return "http://" + m_Game->gameShortName().toLower() + ".nexusmods.com/mods";
+ return "http://" + m_Game->gameNexusName().toLower() + ".nexusmods.com/mods";
}
@@ -599,7 +599,7 @@ void NexusInterface::managedGameChanged(IPluginGame const *game) namespace {
QString get_management_url(MOBase::IPluginGame const *game)
{
- return "http://nmm.nexusmods.com/" + game->gameShortName().toLower();
+ return "http://nmm.nexusmods.com/" + game->gameNexusName().toLower();
}
}
diff --git a/src/selfupdater.cpp b/src/selfupdater.cpp index c16be545..1b6b4684 100644 --- a/src/selfupdater.cpp +++ b/src/selfupdater.cpp @@ -123,7 +123,7 @@ void SelfUpdater::testForUpdate() {
// TODO: if prereleases are disabled we could just request the latest release
// directly
- m_GitHub.releases(GitHub::Repository("TanninOne", "modorganizer"),
+ m_GitHub.releases(GitHub::Repository("LePresidente", "modorganizer"),
[this](const QJsonArray &releases) {
QJsonObject newest;
for (const QJsonValue &releaseVal : releases) {
diff --git a/src/version.rc b/src/version.rc index 34f9b7dd..bc5ba58e 100644 --- a/src/version.rc +++ b/src/version.rc @@ -1,7 +1,7 @@ #include "Winver.h"
-#define VER_FILEVERSION 2,0,7
-#define VER_FILEVERSION_STR "2.0.7beta\0"
+#define VER_FILEVERSION 2,0,8
+#define VER_FILEVERSION_STR "2.0.8beta\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION
|