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

244 Commits

Author SHA1 Message Date
flow
9f462dcc27
fix: update tomlplusplus submodule 
This fixes an issue with Windows TOML file parsing with non-latin
characters.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-11-05 16:28:54 -03:00
TheLastRar
79a728d7d2 Fix: Conflicting types for hoedown functions 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:39 +00:00
TheLastRar
1d38248194 Libraries: Add ECM 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-04 18:11:36 +00:00
TheLastRar
6d4efc0443 Libraries: Add zlib 
Signed-off-by: TheLastRar <TheLastRar@users.noreply.github.com>
 2022-11-03 21:35:28 +00:00
Bensuperpc
56ae4e5b6a
Change old style cast to C++ cast 
Change old style cast to C++ cast

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
 2022-10-22 13:04:48 +02:00
Samisafool
8201d1df02
Rename 
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
 2022-10-19 15:02:43 +05:30
DioEgizio
87d35f0d16 fix: remove some unused libs 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-10-15 20:16:15 +02:00
flow
c520faed6d feat: add gulrak/filesystem submodule 
... for old macs that don't have std::filesystem in their stdlib.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-14 14:08:42 +02:00
Sefa Eyeoglu
fafc9cf9ca
Merge pull request #1033 from Scrumplex/multi-arch-support 2022-10-08 20:12:40 +02:00
Sefa Eyeoglu
62841c5b23
fix: pin tomlplusplus to latest release 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-26 13:44:28 +02:00
Trial97
600c49f7f0
Replaced tomlc99 with tomlplusplus 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
 2022-09-24 00:10:27 +03:00
Sefa Eyeoglu
7e280de361
refactor: drop 64-bit check 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-20 16:01:08 +02:00
Sefa Eyeoglu
098327f128
Merge pull request #903 from jopejoe1/demo-launch 2022-09-18 14:41:25 +02:00
flow
5765a1fdf1 fix: allow demo for older versions 
We were not propagating the '--demo' flag in the legacy launcher,
unconditionally setting the 'demo' parameter to false.

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-09-15 18:44:18 -03:00
Sefa Eyeoglu
684b8f24f3
fix: allow starting rd- versions 
Using `Collections.emptyList()` doesn't allow us to later append stuff
into that list. Use an empty `ArrayList` instead.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-15 09:29:48 +02:00
Sefa Eyeoglu
1b559c7776
Revert "Move classpath definition into NewLaunch itself" 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-09-05 17:37:10 +02:00
flow
ba3ac85356
Merge pull request #1067 from Scrumplex/classpath-epicness 
Move classpath definition into NewLaunch itself
 2022-08-31 18:28:29 -03:00
Sefa Eyeoglu
afcd669d2f
Merge pull request #965 from flowln/fat_files_in_memory 
Refactor a bit EnsureMetadataTask and calculate hashes in a incremental manner
 2022-08-28 11:03:12 +02:00
DioEgizio
6b6a095b91 fix(COPYING): fix COPYING.md by adding some missing copyright notices 
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-19 18:42:26 +02:00
Sefa Eyeoglu
01505910f4
refactor: move classpath definition into NewLaunch itself 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-08-18 18:14:01 +02:00
txtsd
78dc0cfdf3
chore(markdown): MD001 Heading levels should only increment by one level at a time 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:57 +05:30
txtsd
123d1864f4
chore(markdown): MD037 Spaces inside emphasis markers 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:57 +05:30
txtsd
96a91e988d
chore(markdown): MD010 Hard tabs 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:56 +05:30
txtsd
19ecb1701e
chore(markdown): MD031 Fenced code blocks should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:56 +05:30
txtsd
8085b2728d
chore(markdown): MD032 Lists should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 13:00:56 +05:30
txtsd
3275bc4e93
chore(markdown): MD009 Trailing spaces 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:57:30 +05:30
txtsd
8963378039
chore(markdown): MD007 Unordered list indentation 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:57:30 +05:30
txtsd
c7d435bb7a
chore(markdown): MD025 Multiple top-level headings in the same document 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:57:11 +05:30
txtsd
fba20e2cfb
chore(markdown): MD040 Fenced code blocks should have a language specified 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:55:11 +05:30
txtsd
358f080c76
chore(markdown): MD012 Multiple consecutive blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:55:11 +05:30
txtsd
8cea57ff0f
chore(markdown): MD022 Headings should be surrounded by blank lines 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-08-06 12:53:50 +05:30
DioEgizio
abd090bd48
fix: remove iconfix from libraries/README.MD 
someone forgor (💀) to remove it

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
 2022-08-01 20:21:19 +02:00
flow
24c034ff6a
change(libs): use a 4MiB buffer by default in murmur2 hashing 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-24 17:46:54 -03:00
flow
f95bcf45ad
feat(libs): add incremental version of murmurhash2 calculation 
This does two passes for a given file, which is kinda slow, but I don't
know how else to get the size excluding the filtered ones :<

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-24 17:46:53 -03:00
Sefa Eyeoglu
c666c3e251
refactor!: bump to C++17 and C17 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-20 14:22:10 +02:00
flow
32a9545360
libs: add murmur2 library 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-07-17 11:33:41 -03:00
Sefa Eyeoglu
e58158c3cd
feat: add Qt 6 support to CMake 
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-07-10 12:19:14 +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
e6fe701727
Merge pull request #808 from Scrumplex/fix-lgtm-warnings 2022-07-09 01:10:59 +02:00
Sefa Eyeoglu
04b865adae
Merge pull request #707 from Jan200101/PR/gamemode 
Add Performance related settings
 2022-07-06 17:11:43 +02:00
txtsd
00df092a99
chore(readme): Reword and place entry in alphabetical order 
Signed-off-by: txtsd <thexerothermicsclerodermoid@gmail.com>
 2022-07-06 09:34:17 +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
flow
fb75c23f4e
Merge pull request #784 from Scrumplex/refactor-cmake 
Refactor tests
 2022-07-02 17:50:08 -03:00
flow
bf9888099c
Merge pull request #800 from Scrumplex/refactor-newlaunch-package 
Rename NewLaunch package
 2022-07-01 10:05:07 -03:00
Sefa Eyeoglu
9ec260619b
fix: fix warnings reported by LGTM.com 2022-06-17 16:34:32 +02:00
Sefa Eyeoglu
08fc3ea2e0
fix: add classpath exception to launcher library 
Signed-off-by: icelimetea <fr3shtea@outlook.com>
 2022-06-16 17:58:38 +02:00
Sefa Eyeoglu
8b9ac63657
chore: update COPYING.md 2022-06-15 10:15:35 +02:00
Sefa Eyeoglu
0ba02f0830
refactor: rename NewLaunch package 2022-06-15 10:05:35 +02:00
Sefa Eyeoglu
effe46db86
refactor: move away from UnitTest.cmake 2022-06-14 14:44:49 +02:00
icelimetea
8e43190984
Compile JavaCheck for Java 7 2022-06-12 17:46:40 +01:00
icelimetea
63b69c0b0c
Change formatting of JavaCheck 2022-06-12 16:29:39 +01:00
icelimetea
dd6d8e0002
Make Launcher class to look more like original 2022-06-05 02:43:14 +01:00
icelimetea
cd49406bfe
Fix launching process for some legacy Forge versions 2022-06-05 01:18:59 +01:00
icelimetea
3f259eb97a Refactor script parsing 2022-05-14 16:48:14 +01:00
icelimetea
fac0b027b3 Fix the license header 2022-05-14 16:46:57 +01:00
icelimetea
c3336251e0 Add the license header to EntryPoint 2022-05-13 18:10:11 +01:00
icelimetea
c054d0f329 Add the license header to LauncherFactory 2022-05-13 17:21:35 +01:00
icelimetea
067484a6a8 Fix formatting 2022-05-13 16:59:00 +01:00
icelimetea
113528e1f2 Make line count check more lenient 2022-05-05 07:20:33 +01:00
icelimetea
6bffa06063 Fix typo 2022-05-05 07:16:16 +01:00
icelimetea
dcc41ef885 Improve mpticket file parsing code 2022-05-05 07:14:32 +01:00
icelimetea
9a87ae575e More minor fixes 2022-05-03 03:19:26 +01:00
icelimetea
860a7af679 Fix method access modifier 2022-05-03 00:53:22 +01:00
icelimetea
4fdb21b414 Compile with Java 7 in mind 2022-05-03 00:27:14 +01:00
icelimetea
eeb5297284 Use only Java 7 features (in order to deal with #515) 2022-05-03 00:25:26 +01:00
icelimetea
8de63b60b1 Refactor some parts of NewLaunch (part 2) 2022-05-02 22:36:55 +01:00
Sefa Eyeoglu
bd946c78f3
Merge pull request #486 from icelimetea/refactor-java-launcher 
Refactor some parts of NewLaunch
 2022-04-28 07:18:39 +02:00
icelimetea
884f772362 Clarify exception messages 2022-04-25 11:22:56 +01:00
icelimetea
b0a469baab Use java.util.logging instead of custom logging 2022-04-24 15:10:35 +01:00
icelimetea
c968c1be78 Refactor some parts of NewLaunch 2022-04-24 14:45:01 +01:00
flow
3ec511010f
fix: Build iconfix as static library 
On CI we build using the bundled Quazip, and automatically set
-DBUILD_STATIC_LIBS to true, so it build iconfix statically as well.

However, since we recently added support for using the system quazip,
this flag is not set anymore, and PolyMC fails to run because iconfix
neither is statically linked, nor it creates a .so file for dynamic
linking.

Since most other libs are built statically, we should make this one
static as well. Maybe we should consider allowing for dynamic linking of
libs now that quazip is not much of an issue anymore. :^)
 2022-04-21 09:34:44 -03:00
flow
af167e8e67
libs: update bundled submodules 2022-04-16 10:23:15 -03:00
Philipp David
1b47132ebb
libnbtplusplus: fix compilation as shared library 2022-03-24 08:32:26 +01:00
Philipp David
c7c83a35fa
Enable LTO/IPO on release builds 2022-03-22 21:04:35 +01:00
Philipp David
e8373bbf65
Build with static rainbow 2022-03-21 12:47:42 +01:00
Philipp David
26acc836d9
Revert "fix: use our own prefix for rainbow lib" 
This reverts commit 61db1c46be.
 2022-03-21 09:40:20 +01:00
Sefa Eyeoglu
61db1c46be
fix: use our own prefix for rainbow lib 2022-02-12 17:02:54 +01:00
Sefa Eyeoglu
a60b2feb5f
Revert "refactor(build): link rainbow statically" 
Windows build fails for some reason. Needs to be investigated later

This reverts commit 812f00eb81.
 2022-02-12 16:56:35 +01:00
Sefa Eyeoglu
6ba031f048
refactor(build): link iconfix statically 2022-02-12 16:10:53 +01:00
Sefa Eyeoglu
812f00eb81
refactor(build): link rainbow statically 2022-02-12 16:10:46 +01:00
Sefa Eyeoglu
0442b80a2c
refactor: simpler includes for quazip 2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
3aa809b8c0
refactor: add in-tree QuaZip 2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
efa414c442
refactor: initial migration to QuaZip 1.2 
Let's move off our custom QuaZip. In the olden times we needed the
custom version of QuaZip, as it was basically unmaintained and on
SourceForge (eww). But nowadays it's maintained and on GitHub. See
new GitHub page: https://github.com/stachenov/quazip
 2022-01-31 21:40:59 +01: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
seth
390a90b361
stop cmake from blocking builds on wsl 2022-01-08 22:49:30 -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
0c306d3676
update submodule 2021-12-21 00:03:43 +00:00
Lenny McLennington
18a931eaa9
Merge remote-tracking branch 'upstream/develop' into develop 2021-12-20 03:01:41 +00:00
Petr Mrázek
6d3eace2a8 NOISSUE fix up java dependency to 1.7 so builds work again 
'7' is not a thing
 2021-12-19 19:11:08 +01: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
Graeme Geldenhuys
7179e75e70 Changes required to support FreeBSD 2021-12-12 11:39:36 +00:00
Dāvis Mosāns
c29b616497 Update Java version to 7+ 
Otherwise currently it doesn't build with newer Java
 2021-12-10 03:15:01 +02:00
Petr Mrázek
859d710581 GH-4071 handle invalid MSA refresh token as a hard error 2021-11-28 19:01:21 +01:00
Petr Mrázek
285188ea53 GH-4071 handle network errors when logging in with MSA as 'soft' 
This makes the tokens not expire when such errors happen.

Only applies to MSA, not the XBox and Mojang steps afterwards.
Further testing and improvements are still needed.
 2021-11-28 18:42:01 +01:00
Petr Mrázek
27f276ef13 GH-1795 add terminal launch option to use a specific Minecraft profile 
Used like this:
```
./MultiMC --launch 1.17.1 --profile MultiMCTest --server mc.hypixel.net
```
 2021-10-31 21:43:33 +01:00
Petr Mrázek
7c86732a47 NOISSUE Update links to repo, fix up library README 2021-10-21 23:25:52 +02:00
Petr Mrázek
5b3dffce62 NOISSUE continue debranding... 2021-10-21 00:47:53 +02:00
Petr Mrázek
f39c313c5f NOISSUE fix _ICONFIX_EXPORT 2021-10-21 00:47:53 +02:00