CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,718 Commits 10 Branches 30 Tags 34 MiB
9cc3d9d4ce
Commit Graph

57 Commits

Author SHA1 Message Date
TheKodeToad
9cc3d9d4ce Merge remote-tracking branch 'upstream/develop' into skinfix 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2023-02-19 11:35:26 +00:00
BalkanMadman
c125c96e88 Java installations detection fix for Linux 
Signed-off-by: BalkanMadman <zurabid2016@gmail.com>
 2023-02-04 16:48:06 +02:00
flow
29f7ea752f
refactor: make shared_qobject_ptr ctor explicit 
This turns issues like creating two shared ptrs from a single raw ptr
from popping up at runtime, instead making them a compile error.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2023-01-25 16:57:51 -03:00
TheKodeToad
87bcefd08a Automatically add add-opens if Java version >= 9 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
 2022-12-15 15:28:24 +00:00
Sefa Eyeoglu
392452d422
Merge pull request #397 from flowln/windows_mod_updater_fixes_maybe 
Fixes https://github.com/PrismLauncher/PrismLauncher/issues/226
 2022-11-10 14:34:15 +01:00
Sefa Eyeoglu
695734636f
Merge pull request #294 from piperswe/add-snapcraft-yml 2022-11-05 11:09:51 +01:00
flow
353b51f11e
refactor: move MMCStrings -> StringUtils 
General utilities can go in here >:)

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-04 16:53:24 -03:00
flow
7956e6f04e
fix: don't use forward-declared Ptr types in meta/ 
This would cause ODR violations when those headers were included in
other places that also included stuff like "Version.h" (note the
"meta/Version.h"), which can cause problems, especially in LTO.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-01 19:48:26 -03:00
Piper McCorkle
2e0f818905 Add a snapcraft.yml for building Snaps 
The included snapcraft.yml can be used to build a Snap (the application
format used by Canonical's modern package manager) out of Prism. If the
project wants in the future, Prism can publish these Snaps to the Snap
Store so the Prism Launcher can be installed through the Ubuntu Software
app on vanilla Ubuntu.

I haven't registered the Snap name, so it's currently free for anyone to
reserve. I'd suggest that a Prism developer register the name
prismlauncher at https://snapcraft.io/register-snap to ensure the name
belongs to the project, even if there are no plans of setting up CI to
publish snaps in the short term.

I have also modified JavaUtils.cpp to be able to autodetect the Java
versions included in the Snap, and added "*.snap" to the .gitignore so
the compiled Snap isn't accidentally committed to the repository.

Signed-off-by: Piper McCorkle <contact@piperswe.me>
 2022-10-26 09:25:54 -05:00
AliceDTRH
b2789fef0f
Use correct variable for Windows 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 17:19:34 +02:00
AliceDTRH
1471eddc7e
Deduplicates java installs before passing it on 
Signed-off-by: AliceDTRH <57547425+AliceDTRH@users.noreply.github.com>
 2022-10-22 16:40:31 +02:00
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
Sefa Eyeoglu
722194405a
refactor: initial rebrand 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-10-18 09:37:59 +02:00
Sefa Eyeoglu
4c7d3a103c
refactor: restructure tests 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-11 22:29:01 +02:00
Tayou
26f31e9288
use qEnvironmentVariable instead of qgetenv in JavaUtils 
Signed-off-by: Tayou <tayou@gmx.net>
 2022-08-18 23:59:35 +02:00
Tayou
bb4861cf0d check for java installs in PATH on windows 
this should find java installs from scoop as well as any other installer, that registers java in the PATH environment variable.

Signed-off-by: Tayou <tayou@gmx.net>
 2022-08-18 18:24:32 +02:00
timoreo
6aad750fe0
Merge pull request #893 from Scrumplex/refactor-env-handling 2022-07-23 14:08:10 +02:00
Sefa Eyeoglu
fd2b206997
fix: support LD_* for OpenBSD 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
2d53c7c5b2
refactor: filter values in environment variables 
Before this change, you had to specify custom LD_* variables using the
prefix GAME_LD_*. Now instead of dropping all LD_* variables by default,
we should just filter them and remove the values we *know* are from our
start script.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 18:07:58 +02:00
Sefa Eyeoglu
8fc1653b0c
fix: fix Java Checker on Windows, again 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-19 11:12:11 +02:00
Sefa Eyeoglu
17ea51ce27
fix: fix memory leak on Windows 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-16 20:08:08 +02:00
Sefa Eyeoglu
a4672ba00f
fix: remove unnecessary code for Windows 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-11 19:09:20 +02:00
Sefa Eyeoglu
c0bf267bae
fix: fix unicode issue with JavaChecker on Windows 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-11 18:53:20 +02:00
Sefa Eyeoglu
eb5ed50824
fix: set UNICODE and _UNICODE for Qt 5 builds 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
3b4539de79
chore: update license headers 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
15c5bbcf22
fix: fix slots for Qt 6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
c363423718
refactor: fix deprecation up to Qt 6 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:15 +02:00
Sefa Eyeoglu
ff2cd50bfa
refactor: replace QRegExp with QRegularExpression 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:17:52 +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
474d77ac57
feat: resolve JARs dynamically 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-03 17:31:01 +02:00
Sefa Eyeoglu
effe46db86
refactor: move away from UnitTest.cmake 2022-06-14 14:44:49 +02:00
Victor
cf8680f1ab fix: properly detect arm64 2022-04-04 16:41:23 +02:00
dada513
b53ba12fa2
Merge pull request #360 from FayneAldan/patch-2 2022-03-29 14:34:14 +02:00
Fayne Aldan
4d8bf0b621
Convert \s in Windows POLYMC_JAVA_PATHS 
Allows you to use either `\` or `/` on Windows
 2022-03-28 15:55:54 -06:00
Fayne Aldan
659f93b1de
Fix POLYMC_JAVA_PATHS env not working on Windows 2022-03-27 17:21:34 -06:00
Petr Mrázek
ddfed7bb87
NOISSUE in java checker, ignore invalid lines altogether 
Declaring them as errors is just causing problems because Java
randomly prints garbage to STDOUT now.
 2022-01-24 11:44:47 +01:00
Petr Mrázek
f78bb90ed9 GH-4125 fix it better 2022-01-15 16:25:52 -05:00
Petr Mrázek
dc129fd886 GH-4125 workaround for java printing garbage to stdout on bedrock linux 2022-01-15 16:25:52 -05:00
Mustafa Çalışkan
3329d94c9b Introduce POLYMC_JAVA_PATHS env 2022-01-11 18:24:37 +03:00
Mustafa Çalışkan
a12118f1a0 Sort java versions from current to oldest 2022-01-11 17:40:58 +03: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
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
dada513
d821ffb829
Flatpak & Debian Packaging (#4) 
Flatpak & Debian packages
 2021-12-28 10:45:04 -05:00
Graeme Geldenhuys
7179e75e70 Changes required to support FreeBSD 2021-12-12 11:39:36 +00:00
NewoIsTaken
b1910642bf
GH-4000 Scan for Adoptium JREs 2021-12-10 21:17:09 -05:00
Petr Mrázek
241086883e
Merge pull request #4230 from NewoIsTaken/patch-1 
GH-4224 Scan 64 bit lib directory to find Java
 2021-11-28 21:45:36 +01:00
Petr Mrázek
b258eac215 NOISSUE continue reshuffling the codebase 2021-11-22 03:55:16 +01:00
Petr Mrázek
9fc677c2a4 NOISSUE more refactoring 2021-11-21 23:36:55 +01:00
Petr Mrázek
69213b1206 NOISSUE continue refactoring things to make tests pass 2021-11-21 23:21:12 +01:00