diff options
| author | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
|---|---|---|
| committer | flow <thiagodonato300@gmail.com> | 2022-03-24 18:24:51 -0300 |
| commit | e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0 (patch) | |
| tree | c04986ab61f789e4a01b854c374dc8ee15f4dffa /launcher/modplatform/legacy_ftb/PackInstallTask.cpp | |
| parent | da43ed8ce1d804fe20c44788577a0387a698ed6e (diff) | |
| parent | 92f3154e8f7c1421541a00ae7cf57f188cfe46a5 (diff) | |
| download | PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.gz PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.tar.bz2 PrismLauncher-e13ca94061c7fdfec9bd18b982b56a8d5a1f80b0.zip | |
chore: resolve conflicts and merge upstream
Diffstat (limited to 'launcher/modplatform/legacy_ftb/PackInstallTask.cpp')
| -rw-r--r-- | launcher/modplatform/legacy_ftb/PackInstallTask.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp index f655a066..c63a9f1e 100644 --- a/launcher/modplatform/legacy_ftb/PackInstallTask.cpp +++ b/launcher/modplatform/legacy_ftb/PackInstallTask.cpp @@ -114,7 +114,7 @@ void PackInstallTask::install() //ok, found minecraft dir, move contents to instance dir if(!QDir().rename(m_stagingPath + "/unzip/minecraft", m_stagingPath + "/.minecraft")) { - emitFailed(tr("Failed to move unzipped minecraft!")); + emitFailed(tr("Failed to move unzipped Minecraft!")); return; } } |