ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into time4

Browse Source
This commit is contained in:
Trial97 2023-11-23 10:40:30 +02:00
commit 4ef626dab3
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
garnix.yaml
View File

@ -1,5 +1,6 @@
builds: builds:
exclude: [] exclude:
- "*.x86_64-darwin.*"
include: include:
- "checks.x86_64-linux.*" - "checks.x86_64-linux.*"
- "devShells.*.*" - "devShells.*.*"

3
launcher/ui/pages/global/APIPage.ui
View File

@ -209,6 +209,9 @@
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you only need to set this to access private data. Read the &lt;a href=&quot;https://docs.modrinth.com/api-spec/#section/Authentication&quot;&gt;documentation&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Note: you only need to set this to access private data. Read the &lt;a href=&quot;https://docs.modrinth.com/api-spec/#section/Authentication&quot;&gt;documentation&lt;/a&gt; for more information.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">

6
launcher/ui/pages/global/JavaPage.ui
View File

@ -84,7 +84,7 @@
<string notr="true"> MiB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>8</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>1048576</number> <number>1048576</number>
@ -106,7 +106,7 @@
<string notr="true"> MiB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>8</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>1048576</number> <number>1048576</number>
@ -128,7 +128,7 @@
<string notr="true"> MiB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>64</number> <number>4</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>999999999</number> <number>999999999</number>

6
launcher/ui/pages/instance/InstanceSettingsPage.ui
View File

@ -155,7 +155,7 @@
<string notr="true"> MiB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>8</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>1048576</number> <number>1048576</number>
@ -177,7 +177,7 @@
<string notr="true"> MiB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>128</number> <number>8</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>1048576</number> <number>1048576</number>
@ -199,7 +199,7 @@
<string notr="true"> MiB</string> <string notr="true"> MiB</string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>64</number> <number>4</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>999999999</number> <number>999999999</number>

6
launcher/ui/widgets/JavaSettingsWidget.cpp
View File

@ -80,7 +80,7 @@ void JavaSettingsWidget::setupUi()
m_minMemSpinBox = new QSpinBox(m_memoryGroupBox); m_minMemSpinBox = new QSpinBox(m_memoryGroupBox);
m_minMemSpinBox->setObjectName(QStringLiteral("minMemSpinBox")); m_minMemSpinBox->setObjectName(QStringLiteral("minMemSpinBox"));
m_minMemSpinBox->setSuffix(QStringLiteral(" MiB")); m_minMemSpinBox->setSuffix(QStringLiteral(" MiB"));
m_minMemSpinBox->setMinimum(128); m_minMemSpinBox->setMinimum(8);
m_minMemSpinBox->setMaximum(1048576); m_minMemSpinBox->setMaximum(1048576);
m_minMemSpinBox->setSingleStep(128); m_minMemSpinBox->setSingleStep(128);
m_labelMinMem->setBuddy(m_minMemSpinBox); m_labelMinMem->setBuddy(m_minMemSpinBox);
@ -93,7 +93,7 @@ void JavaSettingsWidget::setupUi()
m_maxMemSpinBox = new QSpinBox(m_memoryGroupBox); m_maxMemSpinBox = new QSpinBox(m_memoryGroupBox);
m_maxMemSpinBox->setObjectName(QStringLiteral("maxMemSpinBox")); m_maxMemSpinBox->setObjectName(QStringLiteral("maxMemSpinBox"));
m_maxMemSpinBox->setSuffix(QStringLiteral(" MiB")); m_maxMemSpinBox->setSuffix(QStringLiteral(" MiB"));
m_maxMemSpinBox->setMinimum(128); m_maxMemSpinBox->setMinimum(8);
m_maxMemSpinBox->setMaximum(1048576); m_maxMemSpinBox->setMaximum(1048576);
m_maxMemSpinBox->setSingleStep(128); m_maxMemSpinBox->setSingleStep(128);
m_labelMaxMem->setBuddy(m_maxMemSpinBox); m_labelMaxMem->setBuddy(m_maxMemSpinBox);
@ -112,7 +112,7 @@ void JavaSettingsWidget::setupUi()
m_permGenSpinBox = new QSpinBox(m_memoryGroupBox); m_permGenSpinBox = new QSpinBox(m_memoryGroupBox);
m_permGenSpinBox->setObjectName(QStringLiteral("permGenSpinBox")); m_permGenSpinBox->setObjectName(QStringLiteral("permGenSpinBox"));
m_permGenSpinBox->setSuffix(QStringLiteral(" MiB")); m_permGenSpinBox->setSuffix(QStringLiteral(" MiB"));
m_permGenSpinBox->setMinimum(64); m_permGenSpinBox->setMinimum(4);
m_permGenSpinBox->setMaximum(1048576); m_permGenSpinBox->setMaximum(1048576);
m_permGenSpinBox->setSingleStep(8); m_permGenSpinBox->setSingleStep(8);
m_gridLayout_2->addWidget(m_permGenSpinBox, 2, 1, 1, 1); m_gridLayout_2->addWidget(m_permGenSpinBox, 2, 1, 1, 1);