CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,083 Commits 10 Branches 30 Tags 34 MiB
009623823d
Commit Graph

194 Commits

Author SHA1 Message Date
Sefa Eyeoglu
8f4d7ac655
Merge pull request #678 from Scrumplex/improvements-around-proprietary-services 2022-07-11 14:56:09 +02:00
Sefa Eyeoglu
b3b76d5d56
Merge branch 'develop' into feature/sparkle-mac 
# Conflicts:
#	.github/workflows/build.yml
 2022-07-10 19:38:30 +02:00
Sefa Eyeoglu
984692dc62
refactor: fix deprecation up to Qt 5.15 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +02:00
Sefa Eyeoglu
4103948132
feat: track capabilities of application 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
8a1a583afe
refactor: rename references to CurseForge to Flame 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-08 16:25:03 +02:00
Sefa Eyeoglu
e210a4b244
Revert "fix: remove updater if it is not used" 
This reverts commit 2ff0aa09e3.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-06 18:13:51 +02:00
Sefa Eyeoglu
f1902a4471
Merge pull request #794 from Scrumplex/resolve-jars-dynamically 2022-07-06 17:40:09 +02:00
Jan200101
cad581388f
Add Performance related settings 
Integrates support for Feral Gamemode, discrete GPU support for Mesa and the proprietary Nvidia driver and MangoHud support

Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
 2022-07-06 09:34:14 +02:00
Sefa Eyeoglu
474d77ac57
feat: resolve JARs dynamically 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-03 17:31:01 +02:00
Ezekiel Smith
9cc235cde0
Merge pull request #811 from jn64/fix/window-title 
Fix duplicate name in window title
 2022-06-27 01:13:58 +10:00
Ezekiel Smith
409c9bf9d2
Merge pull request #778 from Scrumplex/track-real-architecture 
Track real CPU architecture for instances
 2022-06-22 01:13:10 +10:00
jn64
4b6ddfb89b Add version to Qt applicationDisplayName 2022-06-18 20:00:28 +08:00
Sefa Eyeoglu
2ff0aa09e3
fix: remove updater if it is not used 2022-06-12 13:39:47 +02:00
Sefa Eyeoglu
91301ec7fe
Merge pull request #632 from ryanccn/macos-app-heuristic 2022-06-12 10:46:49 +02:00
Ryan Cao
13b03e7e50
Update Application.cpp 2022-06-12 11:44:04 +08:00
Sefa Eyeoglu
2257c875f5
Merge pull request #708 from ryanccn/custom-user-agent 2022-06-11 10:53:58 +02:00
Sefa Eyeoglu
8a2e8ad953
feat: track real CPU architecture for instances 2022-06-11 10:48:58 +02:00
Ryan Cao
529fb07b42
I changed my mind 2022-06-10 15:18:47 +08:00
Ryan Cao
757fa1410c
Update launcher/Application.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-06-05 23:52:21 +08:00
Ryan Cao
4cecba8787
make $LAUNCHER_VER actually work 2022-06-04 22:59:57 +08:00
Ryan Cao
25ab121e42
feat: custom user-agent 2022-06-04 15:33:17 +08:00
Ryan Cao
9673dac22b
add more #ifdefs 2022-05-24 16:18:02 +08:00
Ryan Cao
0426149580
standard macOS app behavior 2022-05-24 13:35:01 +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
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
LennyMcLennington
de02deac98
Make if statement condition more readable 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-05-21 17:30:54 +01:00
Lenny McLennington
e2ad3b0183
Add migration wizard, fix migration from custom paste instance 
- Very basic wizard just to allow the user to choose whether to keep
  their old paste settings or use the new default settings.

- People who used custom 0x0 instances would just be kept on those
  settings and won't see the wizard.
 2022-05-21 17:30:19 +01: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
Kenneth Chew
ea4ef1655b
Create SparkleUpdater class for access from Qt/C++ 
To actually get automatic updates going, all that needs to happen is that `SparkleUpdater` needs to be initialized.

The rest of the functions can be connected to elements in the UI.
 2022-05-19 15:16:37 -04:00
Sefa Eyeoglu
8e9f1bcf18
fix: remove unnecessary Qt version checks 2022-05-17 22:25:50 +02:00
Sefa Eyeoglu
cd9e0e0cc0
fix: use own metacache base for modrinth icons 2022-05-16 20:17:19 +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
dac801c8ac
add hide java wizard toggle 2022-04-30 15:19:57 +02:00
Kenneth Chew
ac405aa564
Remove old macOS data migration code 2022-04-25 19:57:47 -04:00
Sefa Eyeoglu
0ccbc801cf
Merge pull request #411 from kthchew/feature/menubar 2022-04-17 23:19:51 +02:00
Sefa Eyeoglu
6ed130fc16
fix: don't allow portable builds on macOS 2022-04-16 18:13:12 +02:00
Sefa Eyeoglu
90d4acd1a1
refactor: combine portable and system builds 
Portable builds now have the same layout as system builds. If you want
to build a portable bundle, you now need to additionally install the
`portable` component.

For example:

    $ cmake -Bbuild -DCMAKE_INSTALL_PREFIX=install ...
    $ cmake --build build
    $ cmake --install build
    $ cmake --install build --component portable
 2022-04-16 18:13:09 +02:00
Kenneth Chew
e59d3a339f
Close the current window instead of the main window from the menu bar 
Systems with native menu bars show the same menu bar for all child windows. As a result, you cannot assume that the menu bar's parent (the `MainWindow`) will be the window in focus.
 2022-04-16 02:07:29 -04: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
Vladislav Laetansky
1811302deb NOISSUE save custom offline player name 2022-04-07 18:29:15 +02:00
Sefa Eyeoglu
5fb096d7b9
Merge pull request #345 from Scrumplex/handle-incompatible-java 2022-04-04 21:01:49 +02:00
dada513
59b3e30821
Scrumplex moment 2022-03-31 16:11:04 +02:00
dada513
341eb16a4c
Merge branch 'develop' of https://github.com/PolyMC/PolyMC into flatpak_properly 2022-03-28 20:55:06 +02:00
dada513
3a7eeff135
Fix 2022-03-28 20:55:03 +02:00
dada513
b1af689546
Add quit launcher after game stops option (Steam Deck) 
lecense
 2022-03-27 14:50:47 +02:00
Sefa Eyeoglu
82c35f2746
feat: block launch if Java is incompatible 
Keep track of compatible Java versions from meta. Launch-step
VerifyJavaInstall will check if current instance's Java version is
compatible.
Also add override option both globally and per-instance in-case the user
doesn't care about the requirement.
 2022-03-24 16:10:39 +01:00
Sefa Eyeoglu
a160bd0062
chore: add license header to files I modified 2022-03-19 12:46:56 +01:00
Sefa Eyeoglu
aedb513c9e
Merge pull request #265 from Scrumplex/fix-javacheck-appimage 
Define JARs path relative to application root
 2022-03-14 23:31:38 +01:00
Ezekiel Smith
5b8003cbe5
Merge pull request #188 from PolyMC/removal/notifications 
remove notifications
 2022-03-15 00:51:28 +11:00
Sefa Eyeoglu
bb2b344d33
fix: define jars path relative to application root 
Fixes #117
 2022-03-13 12:48:24 +01:00
txtsd
5d1ca33b84
Apply suggestions from code review 
Co-authored-by: LennyMcLennington <lenny@sneed.church>
 2022-02-27 08:35:47 -08:00
Sefa Eyeoglu
ca8b62291f
fix: use legacy data path if it exists 2022-02-23 16:22:53 +05:30
txtsd
69d01204e0
Implement PR suggestions 2022-02-23 16:22:53 +05:30
txtsd
1e3b896fda
Replace layouts with LAUNCH_PORTABLE 2022-02-23 16:22:23 +05:30
swirl
da70122d9c
remove notifications 2022-02-20 19:23:08 -05:00
Glitch
8556ff5eac Revert ba6a97557a 
Let evil win.
 2022-02-20 15:00:23 -06:00
Sefa Eyeoglu
6b4469c6cc
fix: combine errors if --launch is missing 2022-02-17 15:29:09 +01:00
Sefa Eyeoglu
037b0d7190
fix: improve code readability in Application.cpp 2022-02-16 17:33:28 +01:00
Lenny McLennington
929a035f96
Revert "make wsl work" 
This reverts commit 5779f20fa1.
 2022-02-13 18:47:54 +00:00
swirl
5779f20fa1
make wsl work 2022-02-13 13:35:15 -05:00
Sefa Eyeoglu
0854e83ce4
feat: implement MSA client id override 
Closes #11
 2022-02-12 21:27:32 +01:00
Sefa Eyeoglu
bb02226870
feat(ui): add custom MSA client id setting 2022-02-12 21:05:42 +01:00
LennyMcLennington
bcfa3246cb
Merge pull request #146 from dada513/macos_application_support 
[MACOS] Move app data to Application Support
 2022-02-11 13:52:56 +00:00
dada513
619fcbfabf
rename LAUNCHER_DESKTOPNAME to LAUNCHER_DESKTOPFILENAME 2022-02-10 08:56:34 +01:00
dada513
d72c511131
Revert "Fix freedesktop icons" and fix icon on kwin 2022-02-10 07:46:41 +01:00
Victor
d2f86cbf32
Move app data to Application Support 2022-02-09 12:23:18 +01:00
swirl
0065a29901
Close after Launch setting 2022-01-29 19:04:44 -05:00
swirl
02889b7a11
Merge pull request #67 from PolyMC/feature/no_paste_ee 
Full replacement of paste.ee
 2022-01-26 17:40:49 -05:00
txtsd
6961a39cd2
feat: Assign java max mem based on system RAM 
If the system has <6GB RAM, it uses (system RAM / 1.5)
If the system has >=6GB, it uses 4GB

Signed-off-by: txtsd <code@ihavea.quest>
 2022-01-23 02:12:03 +05:30
Lenny McLennington
b50e584369
PasteUpload task changed to use 0x0.st's protocol 
- Modified PasteUpload task to upload the log file to 0x0.st and other
  services with the same protocol.

- Modified Paste settings UI to allow the user to select a custom paste
  URL, simplified the settings page code.
 2022-01-19 08:27:26 +00:00
swirl
81fe41a038
Default to colored icons, update copyright 
Closes: #74
 2022-01-16 12:03:30 -05:00
swirl
a606b47a22
pastebin URL app setting 2022-01-14 18:30:02 -05:00
swirl
a62155c1c9
preliminary stuff for paste.ee removal 2022-01-14 18:20:06 -05:00
swirl
b19e315615
Set maximum memory allocated to 4GB by default 2022-01-14 17:34:50 -05:00
swirl
1d8196e11a
More rebranding 
Closes: #39

Mostly done with rebranding now. We just need to translate some services
to PolyMC.
 2022-01-10 12:47:35 -05:00
swirl
0e4ccaca02
fix icon and version 
Closes: #16

Fixed the icon so Qt renders it properly, and actually renders it
properly in the About page. Also, scaled it up a bit

Changed launcher.svg icon to temporary Ouroboros logo

fixed genicons again

Fix version to 1.0.3 (making tag rn)

Install the PolyMC icon properly.
 2022-01-03 17:46:05 -05:00
swirl
3f3c5ea247
Rebranding logo 
add temporary Ouroboros logo, thanks Lenny for vectorizing

change logo file names

Desktop file now includes proper exec using the app binary name

fix genicons for use with libicns
 2021-12-31 16:37:54 -05:00
dada513
fa98ed3ccd
Merge remote-tracking branch 'upstream/develop' into upstream_update 2021-12-31 18:05:40 +01:00
Petr Mrázek
3efcccf334
Merge pull request #4345 from graemeg/freebsd-support 
Adds FreeBSD support to MultiMC
 2021-12-30 20:00:45 +01:00
swirl
f25a9bc103
Completely remove Google Analytics library 2021-12-29 10:37:09 -05:00
Lenny McLennington
18a931eaa9
Merge remote-tracking branch 'upstream/develop' into develop 2021-12-20 03:01:41 +00:00
Lenny McLennington
e6246a9306
Move MSA Client ID to the same place as the others 
MSA Client ID has been moved to CMakeLists.txt, and defaults to the
Client ID for the PolyMC application.

Removed secrets/notsecrets library, replace with (temporary?)
program_info subdirectory.
 2021-12-20 02:57:13 +00:00
Petr Mrázek
3dd6cea8da NOISSUE do people not even build their PRs when they make them? 2021-12-19 19:12:43 +01:00
swirl
ce30cda73e
Fix README and some references to MultiMC. 2021-12-18 14:29:33 +00:00
swirl
7912e0f32b
Apply patches 
Re-add lin-system, and fix Linux datadir

fix jar paths

allow for modern java
 2021-12-18 14:29:33 +00:00
Eldred Habert
cb67fc1d15
Indicate the data folder when related errors occur 
This should help troubleshooting such errors when they occur
 2021-12-15 00:46:35 +01:00
Graeme Geldenhuys
7179e75e70 Changes required to support FreeBSD 2021-12-12 11:39:36 +00:00
Petr Mrázek
3c46d8a412 GH-4071 Heavily refactor and rearchitect account system 
This makes the account system much more modular
and makes it treat errors as something recoverable,
unless they come directly from the MSA refresh token
becoming invalid.
 2021-12-04 01:18:05 +01:00
Petr Mrázek
b258eac215 NOISSUE continue reshuffling the codebase 2021-11-22 03:55:16 +01:00
Petr Mrázek
69213b1206 NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00
Petr Mrázek
0c861db7a2 NOISSUE Some happy little refactors 2021-11-20 16:22:22 +01:00