diff --git a/application/dialogs/AboutDialog.ui b/application/dialogs/AboutDialog.ui index a67626269..0c0619e26 100644 --- a/application/dialogs/AboutDialog.ui +++ b/application/dialogs/AboutDialog.ui @@ -83,7 +83,7 @@ - MultiMC 5 + MultiMC 5 Qt::AlignCenter @@ -258,7 +258,7 @@ p, li { white-space: pre-wrap; } true - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans Mono'; font-size:11pt; font-weight:400; font-style:normal;"> diff --git a/application/dialogs/EditAccountDialog.ui b/application/dialogs/EditAccountDialog.ui index da24c124f..85e235ce2 100644 --- a/application/dialogs/EditAccountDialog.ui +++ b/application/dialogs/EditAccountDialog.ui @@ -17,7 +17,7 @@ - Message label placeholder. + Message label placeholder. Qt::RichText diff --git a/application/dialogs/LoginDialog.ui b/application/dialogs/LoginDialog.ui index b24b1c0cd..99b982151 100644 --- a/application/dialogs/LoginDialog.ui +++ b/application/dialogs/LoginDialog.ui @@ -23,7 +23,7 @@ - Message label placeholder. + Message label placeholder. Qt::RichText diff --git a/application/dialogs/NewInstanceDialog.ui b/application/dialogs/NewInstanceDialog.ui index 58a873540..f9d59a56b 100644 --- a/application/dialogs/NewInstanceDialog.ui +++ b/application/dialogs/NewInstanceDialog.ui @@ -113,7 +113,7 @@ false - ... + ... @@ -123,7 +123,7 @@ false - http:// + http:// @@ -137,7 +137,7 @@ - ... + ... diff --git a/application/dialogs/NotificationDialog.ui b/application/dialogs/NotificationDialog.ui index a2a276e9c..3e6c22bc8 100644 --- a/application/dialogs/NotificationDialog.ui +++ b/application/dialogs/NotificationDialog.ui @@ -11,7 +11,7 @@ - Dialog + Notification @@ -19,14 +19,14 @@ - TextLabel + TextLabel - TextLabel + TextLabel true diff --git a/application/pages/InstanceSettingsPage.ui b/application/pages/InstanceSettingsPage.ui index c9c16a6c3..19a6aa264 100644 --- a/application/pages/InstanceSettingsPage.ui +++ b/application/pages/InstanceSettingsPage.ui @@ -10,9 +10,6 @@ 426 - - Form - 0 @@ -36,7 +33,7 @@ - Java + Java @@ -102,7 +99,7 @@ The maximum amount of memory Minecraft is allowed to use. - MB + MB 512 @@ -138,7 +135,7 @@ The amount of memory Minecraft is started with. - MB + MB 256 @@ -160,7 +157,7 @@ The amount of memory available to store loaded Java classes. - MB + MB 64 @@ -179,7 +176,7 @@ - PermGen: + PermGen: diff --git a/application/pages/LegacyJarModPage.ui b/application/pages/LegacyJarModPage.ui index 059d08dd1..137a4ae52 100644 --- a/application/pages/LegacyJarModPage.ui +++ b/application/pages/LegacyJarModPage.ui @@ -10,9 +10,6 @@ 593 - - LegacyJarModPage - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/LegacyUpgradePage.ui b/application/pages/LegacyUpgradePage.ui index 8d676eae7..5e8c74eb9 100644 --- a/application/pages/LegacyUpgradePage.ui +++ b/application/pages/LegacyUpgradePage.ui @@ -10,9 +10,6 @@ 405 - - Upgrade - 0 diff --git a/application/pages/LogPage.ui b/application/pages/LogPage.ui index 6beb801a4..b558ba367 100644 --- a/application/pages/LogPage.ui +++ b/application/pages/LogPage.ui @@ -10,9 +10,6 @@ 782 - - Log - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/ModFolderPage.ui b/application/pages/ModFolderPage.ui index 353b62c5b..cf991e043 100644 --- a/application/pages/ModFolderPage.ui +++ b/application/pages/ModFolderPage.ui @@ -10,9 +10,6 @@ 532 - - Mods - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/NotesPage.ui b/application/pages/NotesPage.ui index 8da01c8b1..88cca92f1 100644 --- a/application/pages/NotesPage.ui +++ b/application/pages/NotesPage.ui @@ -10,9 +10,6 @@ 538 - - Form - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/OtherLogsPage.ui b/application/pages/OtherLogsPage.ui index 755de6dfa..43d6a35b9 100644 --- a/application/pages/OtherLogsPage.ui +++ b/application/pages/OtherLogsPage.ui @@ -10,9 +10,6 @@ 538 - - Form - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/ScreenshotsPage.ui b/application/pages/ScreenshotsPage.ui index 30b55092c..7b70c07e0 100644 --- a/application/pages/ScreenshotsPage.ui +++ b/application/pages/ScreenshotsPage.ui @@ -10,9 +10,6 @@ 532 - - Mods - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/VersionPage.ui b/application/pages/VersionPage.ui index e1c231978..e88888c80 100644 --- a/application/pages/VersionPage.ui +++ b/application/pages/VersionPage.ui @@ -10,9 +10,6 @@ 575 - - Package Versions - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/WorldListPage.ui b/application/pages/WorldListPage.ui index b172fed89..0018ddf36 100644 --- a/application/pages/WorldListPage.ui +++ b/application/pages/WorldListPage.ui @@ -10,9 +10,6 @@ 532 - - Mods - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 @@ -72,7 +69,7 @@ - MCEdit + MCEdit diff --git a/application/pages/global/AccountListPage.ui b/application/pages/global/AccountListPage.ui index 8ad78cf46..fa2e5bf00 100644 --- a/application/pages/global/AccountListPage.ui +++ b/application/pages/global/AccountListPage.ui @@ -10,9 +10,6 @@ 609 - - Manage Accounts - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/global/ExternalToolsPage.ui b/application/pages/global/ExternalToolsPage.ui index ba1b6f01a..df80d99e0 100644 --- a/application/pages/global/ExternalToolsPage.ui +++ b/application/pages/global/ExternalToolsPage.ui @@ -10,9 +10,6 @@ 751 - - Form - 0 @@ -33,13 +30,13 @@ - Tab 1 + Tab 1 - JProfiler + JProfiler @@ -50,7 +47,7 @@ - ... + ... @@ -76,7 +73,7 @@ - JVisualVM + JVisualVM @@ -87,7 +84,7 @@ - ... + ... @@ -113,7 +110,7 @@ - MCEdit + MCEdit @@ -124,7 +121,7 @@ - ... + ... @@ -166,7 +163,7 @@ - ... + ... diff --git a/application/pages/global/JavaPage.ui b/application/pages/global/JavaPage.ui index f1bc3781f..9a3bee2f5 100644 --- a/application/pages/global/JavaPage.ui +++ b/application/pages/global/JavaPage.ui @@ -16,13 +16,6 @@ 0 - - Settings - - - - :/icons/toolbar/settings:/icons/toolbar/settings - 0 @@ -43,7 +36,7 @@ - Tab 1 + Tab 1 @@ -58,7 +51,7 @@ The maximum amount of memory Minecraft is allowed to use. - MB + MB 512 @@ -94,7 +87,7 @@ The amount of memory Minecraft is started with. - MB + MB 256 @@ -113,7 +106,7 @@ - PermGen: + PermGen: @@ -123,7 +116,7 @@ The amount of memory available to store loaded Java classes. - MB + MB 64 @@ -181,7 +174,7 @@ - ... + ... diff --git a/application/pages/global/MinecraftPage.ui b/application/pages/global/MinecraftPage.ui index 825f6a560..9a18927a1 100644 --- a/application/pages/global/MinecraftPage.ui +++ b/application/pages/global/MinecraftPage.ui @@ -16,13 +16,6 @@ 0 - - Settings - - - - :/icons/toolbar/settings:/icons/toolbar/settings - 0 @@ -46,7 +39,7 @@ - Minecraft + Minecraft diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui index cf748812d..943b30ac4 100644 --- a/application/pages/global/MultiMCPage.ui +++ b/application/pages/global/MultiMCPage.ui @@ -16,13 +16,6 @@ 0 - - Settings - - - - :/icons/toolbar/settings:/icons/toolbar/settings - 0 @@ -95,7 +88,7 @@ - FTB + FTB @@ -134,7 +127,7 @@ true - ... + ... @@ -147,7 +140,7 @@ Qt::TabFocus - ... + ... @@ -183,7 +176,7 @@ - ... + ... @@ -206,14 +199,14 @@ - ... + ... - LW&JGL: + LW&JGL: lwjglDirTextBox @@ -223,7 +216,7 @@ - ... + ... @@ -243,7 +236,7 @@ - ... + ... @@ -377,12 +370,12 @@ - OSX + OSX - iOS + iOS diff --git a/application/pages/global/PasteEEPage.ui b/application/pages/global/PasteEEPage.ui index 84da2b5a1..689c421fb 100644 --- a/application/pages/global/PasteEEPage.ui +++ b/application/pages/global/PasteEEPage.ui @@ -10,9 +10,6 @@ 474 - - Form - 0 @@ -33,7 +30,7 @@ - Tab 1 + Tab 1 diff --git a/application/pages/global/ProxyPage.ui b/application/pages/global/ProxyPage.ui index 7cddd66d6..1330a82ef 100644 --- a/application/pages/global/ProxyPage.ui +++ b/application/pages/global/ProxyPage.ui @@ -16,13 +16,6 @@ 0 - - Settings - - - - :/icons/toolbar/settings:/icons/toolbar/settings - 0 @@ -40,7 +33,7 @@ - + @@ -104,7 +97,7 @@ - 127.0.0.1 + 127.0.0.1 diff --git a/application/widgets/MCModInfoFrame.ui b/application/widgets/MCModInfoFrame.ui index ce418267e..5ef33379d 100644 --- a/application/widgets/MCModInfoFrame.ui +++ b/application/widgets/MCModInfoFrame.ui @@ -22,9 +22,6 @@ 120 - - Frame - 6