Commit Graph

353 Commits

Author SHA1 Message Date
dada513
292869141f
Merge remote-tracking branch 'polymc/develop' into fix_kwin_icon 2022-02-10 08:05:17 +01:00
dada513
ca9929214d
Merge remote-tracking branch 'polymc/develop' into macos_application_support 2022-02-10 08:04:59 +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
Lenny McLennington
5284d604ef
translations 2022-02-09 00:02:51 +00:00
glowiak
dba9199e58
Support OpenBSD in UpdateController.cpp 2022-02-06 09:35:48 +01:00
glowiak
e806903d7e
Support OpenBSD without patches 2022-02-06 09:32:55 +01:00
timoreo
86935068f5
Fix wrong mod file name 2022-02-04 16:24:19 +01:00
swirl
076efc4cb2
Merge branch 'update-quazip' of git://github.com/Scrumplex/PolyMC into develop 2022-02-03 14:14:12 -05:00
swirl
2177aa2a6b
Merge branch 'offline-mode-accounts' of git://github.com/NyaomiDEV/PolyMC into feature/offline_mode 2022-02-03 13:54:27 -05:00
swirl
e2952061af
Merge branch 'feature/download_mods' of git://github.com/timoreo22/PolyMC into feature/download_mods 2022-02-03 13:45:20 -05:00
swirl
f5358aa1ca
Merge branch 'develop' into feature/close_after_launch 2022-02-03 13:43:44 -05:00
swirl
3d3f9a8609
make closeAfterLaunch good 2022-02-03 12:50:24 -05:00
Petr Mrázek
3ca661127f NOISSUE Add missing tooltip for Export Instance action 2022-02-03 18:09:51 +01:00
swirl
407f9d9ef0
Merge remote-tracking branch 'upstream/develop' into develop 2022-02-02 11:17:04 -05:00
swirl
bff683e6d4
Merge pull request #108 from redstrate/improve_about_page
Improve the About page
2022-02-02 09:17:30 -05:00
timoreo22
11841c47e6
Double braindead combo 2022-02-01 22:23:34 +01:00
timoreo
71b1ac9f34
Fix braindead moments 2022-02-01 21:56:52 +01:00
Sefa Eyeoglu
c4cb7ddc4f
fix: bring back JAR Folder mods
what is this?
2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
a8089b76c0
fix: bring back instance exports 2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
0442b80a2c
refactor: simpler includes for quazip 2022-01-31 21:40:59 +01:00
Sefa Eyeoglu
81c72c2038
refactor: bring back methods that need to be reimplemented 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
timoreo
aa2c27bf69
Update to Modrinth API V2 2022-01-31 17:18:11 +01:00
Joshua Goins
0211ee3ef1 Add "PolyMC Contributors" to Credits section
This also adds a link to the PolyMC Contributors page on Github.
2022-01-31 09:09:58 -05:00
Petr Mrázek
2cf04d034a
Merge pull request #4300 from Ghosty141/feature/screenshot_copy
GH-4044 Implemented copy screenshots to the clipboard
2022-01-30 16:11:47 +01:00
bexnoss
e0a04c5031 Lock offline mode support behind insertion of at least one Minecraft account
Co-Authored-By: Naomi Calabretta <tony0000.ac@gmail.com>
2022-01-30 02:42:29 +01:00
bexnoss
9d23ac562f Add offline mode support 2022-01-30 02:35:56 +01:00
swirl
0065a29901
Close after Launch setting 2022-01-29 19:04:44 -05:00
Jan200101
3aa9f5c376
Update rpm spec to support OpenSuse and conform to Fedora guidelines 2022-01-28 19:42:30 +01:00
timoreo
efc44c56a6
Fix button being present in other pages 2022-01-28 19:32:42 +01:00
timoreo22
8b790a6dd9
Merge branch 'PolyMC:develop' into feature/download_mods 2022-01-28 18:12:35 +01:00
Joshua Goins
c1aaf89baa Improve the About page
Improves #106. This more clearly marks the original MultiMC contributors,
and now correctly hides the "Build Platform" if this is set as empty. The
version label is now moved under the "PolyMC" title so it looks just a
little bit better (and matches other applications). The copyright on the
"About" page now correctly attributes the MultiMC contributors just like on
the "License" page.
2022-01-27 19:06:07 -05:00
Joshua Goins
5ac528f141 Fix icons changing when exiting the settings window 2022-01-27 18:37:57 -05:00
swirl
33aac2985a
Merge pull request #105 from Scrumplex/rss-begone
Remove news
2022-01-27 17:00:15 -05:00
Sefa Eyeoglu
361ce7818e
refactor: remove news feed
Closes #63
2022-01-27 22:59:20 +01: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
Lenny McLennington
0eff21a4f1
Validate Pastebin URL with regex 2022-01-26 00:34:02 +00: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
timoreo
1d0e6bf453
Changed modrinth author data to not be a list 2022-01-24 07:23:01 +01:00
timoreo
a2d88f6df4
Fixed spacing 2022-01-24 07:12:19 +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
af20b5ee0e
support paste.polymc.org 2022-01-23 12:54:58 -05:00
Stypox
8b31c638f3
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-22 21:58:32 +01:00
Sefa Eyeoglu
dd76fb0ec7
feat(MSALogin): add open page & copy code button
Closes #55
2022-01-20 21:04:48 +01:00
Lenny McLennington
caeab926bc
PasteUpload: Trim whitespace from response body 2022-01-19 19:05:52 +00:00
timoreo
6d22794cf9
Reduce spaghettiness 2022-01-19 09:47:09 +01:00
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
timoreo
affc2521aa
Various fixes 2022-01-18 12:28:55 +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
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
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
Petr Mrázek
917f8a31e3 NOISSUE log server response when failing to fetch profile 2022-01-16 12:51:42 +01:00
Petr Mrázek
aa770b63fb NOISSUE correctly set http status code in auth reply 2022-01-16 12:46:20 +01:00
Petr Mrázek
c1bf31cb27 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-16 12:05:40 +01:00
Petr Mrázek
86d99f80c3 NOISSUE add some logging to profile fetching failures 2022-01-16 11:43:19 +01:00
timoreo
975f77756d
Added curseforge selection 2022-01-16 11:20:21 +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
timoreo
621e0ba4a8
Added smart file selection
This might fail in a few special cases
2022-01-15 10:25:24 +01:00
timoreo
f6de472da2
Added a no version message 2022-01-15 09:06:48 +01:00
timoreo
4b37c46889
Filtering per mod loader & mc version 2022-01-15 08:51:47 +01: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
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
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
timoreo
2896f70cd8
Removing copyrights 2022-01-14 22:07:54 +01:00
timoreo
1a8c972aef
Fixed icons
Also having a mod loader is now enforced
2022-01-14 20:22:15 +01:00
bexnoss
cdaa397dcf Reword offline mode disclaimer 2022-01-14 14:19:31 +01:00
timoreo
9e6fa8f29a
Added the downloading of the mods 2022-01-14 12:47:18 +01:00
timoreo
4d599eb118
Added modrinth icon 2022-01-14 10:51:44 +01:00
timoreo
4e9039be2d
Start of mod downloading 2022-01-14 09:56:27 +01:00
bexnoss
395e265564 Add offline mode disclaimer 2022-01-14 00:01:05 +01: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
bexnoss
d4b522b6cb Add offline mode UI 2022-01-12 10:36:26 +01: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
swirl
1cc7a193c2
add logo to different styles
Also fixed genicons to automate this.
2022-01-09 14:18:51 -05:00
swirl
e50d07f791
remove patreon stuff
Closes: #22

Update to 1.0.5

Remove "Forking/Redistribution" tab in About (why is it even there?)

Metainfo now corresponds to version

add discord

Completely removed Patreon.
2022-01-09 13:51:46 -05:00
Ezekiel Smith
87af5f631d
Update branding: New Logo (#30)
New logo
Co-authored-by: swirl <swurl@swurl.xyz>
2022-01-09 00:13:15 -05:00
Petr Mrázek
52420963cf GH-4125 fix it better 2022-01-08 12:26:16 +01:00
Petr Mrázek
03d7300732 GH-4125 workaround for java printing garbage to stdout on bedrock linux 2022-01-08 11:14:07 +01:00
swirl
2c7d248703
New pixel Ouroboros logo by @karolinaabb 2022-01-06 22:42:33 -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
9579231ccc NOISSUE fix build and change how NetJob is used
Feed it network upfront...
2021-12-31 05:27:59 +01:00
Petr Mrázek
9cc168c526 NOISSUE fix some OS ifdefs 2021-12-31 00:36:25 +01:00
Petr Mrázek
94fdf13f4a NOISSUE proper fix for missing profile + demo mode 2021-12-30 21:26:29 +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
Petr Mrázek
5e909a4e85
Merge pull request #4394 from Janrupf/develop
GH-4299 Fix Screenshot upload
2021-12-30 19:58:16 +01:00
Petr Mrázek
a6e59cb4f4 NOISSUE detect when user loses entitlements 2021-12-30 17:19:41 +01:00
Janrupf
be029ab360 GH-4299 Fix screenshot upload 2021-12-29 19:45:24 +01:00
Janrupf
6fe07561fe GH-4299 Don't hard crash on when missing network 2021-12-29 19:45:15 +01:00
swirl
f25a9bc103
Completely remove Google Analytics library 2021-12-29 10:37:09 -05:00
Graeme Geldenhuys
f42c3a953c Restore getNativePath() to its original form. 2021-12-28 21:59:24 +00:00
dada513
d821ffb829
Flatpak & Debian Packaging (#4)
Flatpak & Debian packages
2021-12-28 10:45:04 -05:00
swirl
a11162ec61
update README, delete RPM/Ubuntu packaging dirs
Closes: #2

Update wording/information for packages

add more of the individual Matrix rooms in case spaces don't work

add PolyMC Discord to README

Deleted RPM & Ubuntu/Debian packaging directories, will need to be moved
to separate repositories.
2021-12-26 16:01:29 -05:00
swirl
a254467184
Matrix room/space, a bit more rebranding 2021-12-24 14:28:54 -05:00
CreeperzEdge
95c9a6d8f4 Use correct title on Java check during setup 2021-12-23 00:53:02 +11: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
Petr Mrázek
6f6fa6955a
Merge pull request #4295 from kb-1000/instanceview-unused-code
NOISSUE Remove some unused code from InstanceView
2021-12-19 18:43:13 +01:00
Petr Mrázek
526b322a4a
Merge pull request #4330 from NewoIsTaken/develop
GH-4000 Scan for Adoptium JREs
2021-12-19 18:40:31 +01:00
Petr Mrázek
aaa12e1ddc
Merge pull request #4354 from ISSOtm/patch-1
Indicate the data folder when related errors occur
2021-12-19 18:36:28 +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
Jamie Mansfield
06bedee835
NOISSUE Add license headers to source files created by me 2021-12-18 00:14:25 +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
Petr Mrázek
7d047f9223 NOISSE add a shortcut to the loaders mods to main window 2021-12-12 22:39:25 +01:00
Graeme Geldenhuys
3bc450a6d7 Restore the previously deleted line. 2021-12-12 16:45:18 +00:00
Graeme Geldenhuys
fce98f5e16 Fixes compilation error expanding from macro 'major'. 2021-12-12 11:45:58 +00:00
Graeme Geldenhuys
7179e75e70 Changes required to support FreeBSD 2021-12-12 11:39:36 +00:00
Petr Mrázek
431d773eec NOISSUE We are using es_UY as latin american spanish
Make it actually say that in the UI.
2021-12-11 13:06:53 +01:00
NewoIsTaken
b1910642bf
GH-4000 Scan for Adoptium JREs 2021-12-10 21:17:09 -05:00
Petr Mrázek
80beccb2c4 NOISSUE Add small workaround for presenting Japanese with Kanji 2021-12-08 01:23:12 +01:00
Petr Mrázek
dba4c452e0 NOISSUE account tweaks 2021-12-08 01:22:57 +01:00
Petr Mrázek
90a62c429a NOISSUE remove the hardcoded blocking of Forge installs
Doesn't make it work, but makes it theoretically possible.
2021-12-06 22:07:41 +01:00
Petr Mrázek
a5581b479e NOISSUE fix launching offline while online 2021-12-06 20:17:31 +01:00
Petr Mrázek
825ef52dd5 NOISSUE fix up some corner cases around migrating accounts 2021-12-06 20:16:13 +01:00
Petr Mrázek
3a940ffb52 NOISSUE Add cat xcf file 2021-12-06 02:40:53 +01:00
Petr Mrázek
70d400f205 NOISSUE party hat for a party cat
On the 30th of November, it's been 10 years since the first
(documented) release of MultiMC. Party hats for everyone :)
2021-12-05 23:26:04 +01:00
Petr Mrázek
c8ca6acc15 NOISSUE fix some error mappings for Mojang accounts 2021-12-05 03:48:07 +01:00
Petr Mrázek
d37003b1de NOISSUE fix builds, make account refresh queue user friendly 2021-12-04 02:10:14 +01:00
Petr Mrázek
db6431d9e0 NOISSUE add missing chrono include 2021-12-04 01:27:58 +01: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
Ghosty
a97d0a36f4 NOISSUE Copy Image is not shown if the selection is > 1 2021-12-03 16:29:28 +01:00
Ghosty
e9c52ec696 NOISSUE Added Copy File(s) feature for the screenshot page
- Ctrl+C now copies the file instead of the image data
- Renamed Copy to Copy Image
2021-12-03 16:08:11 +01:00
Ghosty
75f2dab3c8 NOISSUE Implemented copy screenshots to the clipboard
- Added context-menu entry
- Ctrl+C keybind works as well
- If multiple screenshots are selected, only the first one gets copied
2021-12-03 03:11:53 +01:00
kb1000
eb1091a5f4
NOISSUE Remove some unused code from InstanceView 2021-12-01 21:21:05 +01: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
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
a522cad6d6 NOISSUE also undo the AUTORCC change because it was also broken
It broke 32bit linux builds...
2021-11-23 01:37:13 +01:00
Petr Mrázek
b49987e876 NOISSUE fix fix fix the accounts again 2021-11-23 01:25:24 +01:00