2a1dcd6a38
fix conflicts
...
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-06-14 22:36:08 -04:00
984e5b3b19
Merge remote-tracking branch 'upstream/develop' into develop
...
Signed-off-by: sneedium <sneed@sneedmc.org>
2022-06-14 21:29:00 -04:00
Sefa Eyeoglu
a4ef0940ed
chore: add license headers
2022-06-12 13:50:58 +02:00
Sefa Eyeoglu
2ff0aa09e3
fix: remove updater if it is not used
2022-06-12 13:39:47 +02:00
Sefa Eyeoglu
8856c8cd62
refactor(test): fix loading mod metadata setting
2022-06-12 13:33:17 +02:00
Sefa Eyeoglu
2257c875f5
Merge pull request #708 from ryanccn/custom-user-agent
2022-06-11 10:53:58 +02:00
Sefa Eyeoglu
7a3acc3249
refactor(ui): use tabs for APIPage
2022-06-04 22:04:36 +02:00
Ryan Cao
4cecba8787
make $LAUNCHER_VER actually work
2022-06-04 22:59:57 +08:00
Ryan Cao
5930acc418
change UI to scroll
...
let me just say, this does not look right
2022-06-04 22:54:05 +08:00
Sefa Eyeoglu
1ab00ca8b2
Merge pull request #426 from flowln/mod_perma
...
Add on-disk mod metadata information
2022-06-04 13:23:38 +02:00
Ryan Cao
25ab121e42
feat: custom user-agent
2022-06-04 15:33:17 +08:00
Sefa Eyeoglu
f5405e835e
Merge pull request #624 from ryanccn/global-jvm-args
...
Make global JVM arguments multi-line
2022-05-29 16:10:55 +02:00
Ryan Cao
20832682ef
Update launcher/ui/pages/global/JavaPage.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-05-29 20:35:57 +08:00
Ryan Cao
d4c1d62781
Update launcher/ui/pages/global/JavaPage.cpp
...
Co-authored-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
2022-05-29 12:15:20 +08:00
Ryan Cao
2be8100e7c
Merge branch 'develop' into global-jvm-args
2022-05-28 21:15:00 +08:00
Sefa Eyeoglu
6fb5bb6a5e
fix: fix mnemonics in APIPage
2022-05-27 14:50:06 +02:00
Ryan Cao
e50ec31351
fix
2022-05-25 14:44:47 +08:00
Ryan Cao
8a1ba03bcb
show default metaserver
2022-05-25 11:46:15 +08:00
flow
e17b6804a7
fix: implement PR suggestions
...
Some stylistic changes, and get hashes from the mod providers when
building the metadata.
2022-05-23 14:43:09 -03:00
flow
4439666e67
feat: allow disabling mod metadata usage
2022-05-23 14:42:28 -03:00
Ryan Cao
6d0ea13f97
make JVM args PlainTextEdit
2022-05-23 16:52:12 +08:00
Sefa Eyeoglu
f2e2053134
feat: add trailing slash to meta URL if it is missing
2022-05-22 21:36:31 +02:00
Sefa Eyeoglu
b181f4bc30
fix: improve spacing in APIPage
2022-05-22 21:36:30 +02:00
dada513
f00dbdc215
Make Metaserver changable in settings
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Co-authored-by: flow <flowlnlnln@gmail.com>
2022-05-22 21:35:20 +02:00
Lenny McLennington
caf6d02728
Change paste settings and add copyright headers
...
- There's now a notice reminding people to change the base URL if they
had a custom base URL and change the paste type (that was something I
personally had problems with when I was testing, so a reminder was
helpful for me).
- Broke down some of the long lines on APIPage.cpp to be more readable.
- Added copyright headers where they were missing.
- Changed the paste service display names to the names they are more
commonly known by.
- Changed the default hastebin base URL to https://hst.sh due to the
acquisition of https://hastebin.com by Toptal.
2022-05-21 17:30:09 +01:00
Lenny McLennington
35f71f5793
Support paste.gg, hastebin, and mclo.gs
2022-05-21 17:28:22 +01:00
dada513
2847cefff7
Add cursefrog key override
2022-05-20 19:56:27 +02:00
Sefa Eyeoglu
8e9f1bcf18
fix: remove unnecessary Qt version checks
2022-05-17 22:25:50 +02:00
dada513
0556ae4749
Merge pull request #503 from txtsd/mnemonics_fix
...
Fix mnemonics that didn't parse
2022-05-02 11:19:30 +02:00
dada513
8110040f86
Merge pull request #511 from dada513/hide_java_wizard
...
add hide java wizard toggle
2022-05-01 08:48:37 +02:00
dada513
5662d41062
Update launcher/ui/pages/global/JavaPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-30 16:20:05 +02:00
dada513
1e03ef484d
Update launcher/ui/pages/global/JavaPage.ui
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-30 16:14:48 +02:00
dada513
dac801c8ac
add hide java wizard toggle
2022-04-30 15:19:57 +02:00
txtsd
b931dc0f93
fix(mnemonics): Add missing buddies to labels
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-29 01:30:47 +05:30
Kenneth Chew
ac405aa564
Remove old macOS data migration code
2022-04-25 19:57:47 -04:00
Daniel Schemp
c86ec0bd36
added: Mnemonics for Settings/APIs
2022-04-22 00:23:36 +02:00
Daniel Schemp
08b1b2669a
added: Mnemonics for Settings/Accounts
2022-04-22 00:22:50 +02:00
Daniel Schemp
94a655b055
added: Mnemonics for Settings/External Tools
2022-04-22 00:20:54 +02:00
Daniel Schemp
717067e9eb
added: Mnemonics for Settings/Proxy
2022-04-22 00:19:54 +02:00
Daniel Schemp
75826aca13
added: Mnemonics for Settings/Java
2022-04-22 00:16:11 +02:00
Daniel Schemp
f52b7c030f
added: Mnemonics for Settings/Minecraft+
2022-04-22 00:14:24 +02:00
Daniel Schemp
c1386bcb04
added: Mnemonics for Settings/Launcher
2022-04-22 00:12:20 +02:00
Sefa Eyeoglu
0ccbc801cf
Merge pull request #411 from kthchew/feature/menubar
2022-04-17 23:19:51 +02:00
Kenneth Chew
4c52cc414f
Improve menu bar setting string
2022-04-17 16:39:08 -04:00
Kenneth Chew
6b45386252
Disable instead of hide menu bar option on Linux
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-17 20:32:51 +00:00
Kenneth Chew
1303771b58
Add option to always show menu bar instead of toolbar
...
For those who like keyboard navigation at the expense of aesthetics.
2022-04-15 18:26:41 -04:00
Ezekiel Smith
cc5261051f
Merge pull request #364 from Scrumplex/fix-i18n2
...
Fix translatable strings 2
2022-04-07 23:20:54 +10:00
Sefa Eyeoglu
5fb096d7b9
Merge pull request #345 from Scrumplex/handle-incompatible-java
2022-04-04 21:01:49 +02:00
Ezekiel Smith
382548e0a7
Merge pull request #355 from dada513/flatpak_properly
...
Fix flatpak properly
2022-04-01 21:03:14 +10:00
Sefa Eyeoglu
9202996c62
fix(i18n): remove brand names from translations
2022-03-29 15:25:21 +02:00
