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/technic | |
| 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/technic')
| -rw-r--r-- | launcher/modplatform/technic/TechnicPackProcessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/modplatform/technic/TechnicPackProcessor.cpp b/launcher/modplatform/technic/TechnicPackProcessor.cpp index 156a295a..782fb9b2 100644 --- a/launcher/modplatform/technic/TechnicPackProcessor.cpp +++ b/launcher/modplatform/technic/TechnicPackProcessor.cpp @@ -88,7 +88,7 @@ void Technic::TechnicPackProcessor::run(SettingsObjectPtr globalSettings, const else { if (minecraftVersion.isEmpty()) - emit failed(tr("Could not find \"version.json\" inside \"bin/modpack.jar\", but minecraft version is unknown")); + emit failed(tr("Could not find \"version.json\" inside \"bin/modpack.jar\", but Minecraft version is unknown")); components->setComponentVersion("net.minecraft", minecraftVersion, true); components->installJarMods({modpackJar}); |