summaryrefslogtreecommitdiffstats
path: root/application/pages/global/JavaPage.ui
diff options
context:
space:
mode:
authorTim Flynn <MC42@users.noreply.github.com>2017-01-16 16:42:22 -0500
committerPetr Mrázek <peterix@users.noreply.github.com>2017-01-16 22:42:22 +0100
commit98e17998fe4dd541143de3e1bbc4b267aadb383b (patch)
tree7be0da03813083e231647318e3175c800a0bf6eb /application/pages/global/JavaPage.ui
parent944ff256b2d9e271632efacd6e8dd1ea542e869f (diff)
downloadMultiMC-98e17998fe4dd541143de3e1bbc4b267aadb383b.tar
MultiMC-98e17998fe4dd541143de3e1bbc4b267aadb383b.tar.gz
MultiMC-98e17998fe4dd541143de3e1bbc4b267aadb383b.tar.lz
MultiMC-98e17998fe4dd541143de3e1bbc4b267aadb383b.tar.xz
MultiMC-98e17998fe4dd541143de3e1bbc4b267aadb383b.zip
GH-1065 Normalize usage of directory vs folder
Diffstat (limited to 'application/pages/global/JavaPage.ui')
-rw-r--r--application/pages/global/JavaPage.ui13
1 files changed, 2 insertions, 11 deletions
diff --git a/application/pages/global/JavaPage.ui b/application/pages/global/JavaPage.ui
index ba873d34..9023b932 100644
--- a/application/pages/global/JavaPage.ui
+++ b/application/pages/global/JavaPage.ui
@@ -17,16 +17,7 @@
</sizepolicy>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
+ <property name="margin">
<number>0</number>
</property>
<item>
@@ -273,7 +264,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working directory with INST_ID, INST_DIR, and INST_NAME as environment variables.&lt;/p&gt;&lt;p&gt;Wrapper command allows running java using an extra wrapper program (like 'optirun' on Linux)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working folder with INST_ID, INST_DIR, and INST_NAME as environment variables.&lt;/p&gt;&lt;p&gt;Wrapper command allows running java using an extra wrapper program (like 'optirun' on Linux)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>