Commit Graph

3046 Commits

Author SHA1 Message Date
swirl
0680945839
Merge pull request #96 from dada513/develop
rebase with upstream
2022-01-24 19:36:31 -05:00
swirl
631e670775
Merge pull request #99 from Jan200101/PR/rpm-opensuse
remove explicit dependencies, correct dependencies to work on OpenSuse
2022-01-24 18:40:44 -05:00
Jan200101
4edd2cff9f
remove explicit dependencies, correct dependencies to work on OpenSuse 2022-01-24 23:15:54 +01:00
Stypox
0235eb5c28
Fix error message
The code is trying to get a string from a json object, and if that fails it should log "is not a string", not "is not a timestamp".
2022-01-24 11:44:47 +01:00
Petr Mrázek
8804b035b2
NOISSUE log server response when failing to fetch profile 2022-01-24 11:44:47 +01:00
Petr Mrázek
54e3438e37
NOISSUE correctly set http status code in auth reply 2022-01-24 11:44:47 +01: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
70c04745ee
NOISSUE add some logging to profile fetching failures 2022-01-24 11:44:47 +01:00
swirl
019c77f9f7
Merge pull request #52 from oynqr/develop
Default to system locale language
2022-01-23 15:00:26 -05:00
swirl
5b5c5afc3a
Merge pull request #88 from Scrumplex/launch-msa-login
Add open page & copy code button to MSA login dialog
2022-01-23 14:55:05 -05:00
swirl
a1b779da15
Merge pull request #95 from danielhuang/patch-1
Add StartupWMClass to desktop file
2022-01-23 12:05:39 -05:00
Daniel Huang
3da69d8e53
Update org.polymc.PolyMC.desktop.in 2022-01-22 14:13:21 -05:00
Sefa Eyeoglu
dd76fb0ec7
feat(MSALogin): add open page & copy code button
Closes #55
2022-01-20 21:04:48 +01:00
swirl
35caa3c21a
Merge pull request #87 from Scrumplex/themed-header-image
Header image's text color should follow GitHub theme
2022-01-19 13:06:45 -05:00
Sefa Eyeoglu
7022d3d401
fix(readme): header color should follow GH theme
As browser color scheme preference and GitHub theme can be different
from each other, let's follow GitHub theme instead of browser
preference.
2022-01-19 18:59:24 +01:00
Philipp David
83e1dd285a
Set default lang only if index received 2022-01-17 09:52:04 +01:00
Philipp David
b9beb3c7d2
Sort system locale to front of list 2022-01-17 09:52:04 +01:00
Philipp David
2dd2555a63
Update selected language automatically 2022-01-17 09:52:04 +01:00
Philipp David
126e6d13aa
Use isEmpty instead of 0 length check 2022-01-17 09:52:04 +01:00
Philipp David
236c0166f6
Default to system locale language 2022-01-17 09:52:04 +01:00
LennyMcLennington
2c2c22ccf8
Merge pull request #82 from PolyMC/revert-offline-mode
Revert offline mode support (#81 and #50)
2022-01-17 03:56:27 +00:00
Lenny McLennington
55597b458c
Revert "Merge pull request #50 from bexnoss/offline-mode"
This reverts commit b4f750e7db, reversing
changes made to b19e315615.
2022-01-17 03:45:47 +00:00
Lenny McLennington
f55297eca9
Revert "Merge pull request #81 from bexnoss/fix-msa-account-refresh"
This reverts commit 0bc8baf117, reversing
changes made to 81fe41a038.
2022-01-17 03:45:33 +00:00
swirl
0bc8baf117
Merge pull request #81 from bexnoss/fix-msa-account-refresh 2022-01-16 17:32:13 -05:00
bexnoss
5f9270ed4b Fix MSA account refresh 2022-01-16 23:30:17 +01:00
swirl
81fe41a038
Default to colored icons, update copyright
Closes: #74
2022-01-16 12:03:30 -05:00
swirl
0316cf88aa
Merge pull request #78 from bexnoss/readme-svg-header 2022-01-16 10:33:35 -05:00
bexnoss
8172dcd2d5 Replace PNG README header with SVG
Instead of GitHub specific MarkDown based theming this uses CSS in SVG.
2022-01-16 07:55:10 +01:00
swirl
b95c27ceef
fix readme formatting 2022-01-15 21:26:00 -05: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
swirl
c371558883
Merge pull request #68 from GriffintheFolf/execname
Fix program executable name for shell script
2022-01-14 21:46:46 -05:00
Thomas Sirack
0bbd0ac0b9 Change method of shell script fix per suggestion
The Launcher.in file is now modified rather than CMakeLists.txt
2022-01-14 19:28:10 -07:00
Thomas Sirack
ac93c64cd4 Fix program executable name for shell script 2022-01-14 16:59:16 -07:00
swirl
6cd4375aff
add arch linux package to readme
closes: #53
2022-01-14 18:39:25 -05:00
swirl
b4f750e7db
Merge pull request #50 from bexnoss/offline-mode
Offline Mode Support
2022-01-14 18:03:35 -05:00
swirl
b19e315615
Set maximum memory allocated to 4GB by default 2022-01-14 17:34:50 -05:00
swirl
41dba376a8
remove 5 from display name
Closes: #58
2022-01-14 17:33:34 -05:00
bexnoss
cdaa397dcf Reword offline mode disclaimer 2022-01-14 14:19:31 +01:00
bexnoss
395e265564 Add offline mode disclaimer 2022-01-14 00:01:05 +01:00
swirl
b07853c9ef
Merge pull request #61 from meguminloli/develop 2022-01-13 13:55:29 -05:00
Megumin
b635a7e693
update NIX.md 2022-01-13 15:43:29 +02:00
meguminloli
f84fc783b6 removed redundant recs
removed file
2022-01-13 15:29:10 +02:00
swirl
2301a934b0
Merge pull request #59 from A-UNDERSCORE-D/patch-1 2022-01-13 08:19:08 -05:00
meguminloli
60e9d2754a changed flake.nix
removed result
2022-01-13 13:14:50 +02:00
A_D
d06c2cacb1
Readd original MultiMC/Launcher copyright
The original MMC code remains Apache.
2022-01-13 09:59:16 +02:00
swirl
49c2bd477c
Merge pull request #45 from cidkidnix/develop 2022-01-12 21:11:09 -05:00
bexnoss
46a3b4de6e Remove unnecessary semicolon 2022-01-12 18:41:33 +01:00
bexnoss
6ecc8c5496 Remove unnecessary license header 2022-01-12 14:57:32 +01:00
bexnoss
a1ff3b1ee3 Add offline mode support 2022-01-12 14:26:02 +01:00