0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,212 Commits 1 Branch 0 Tags
e3c8eb062c48d09ec70b687319f0c3f2fc837883
Commit Graph

3212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DioEgizio
5c2d3e430d Merge branch 'develop' into patch-1 2022-01-29 18:10:46 +01:00
Mustafa Çalışkan
b710b719a8 nix: use .desktop file provided by cmake 2022-01-29 17:38:12 +03:00
Mustafa Çalışkan
7df5091fdc flake.lock: Update 
Flake lock file changes:

• Updated input 'flake-utils':
    'github:numtide/flake-utils/74f7e4319258e287b0f9cb95426c9853b282730b' (2021-11-28)
  → 'github:numtide/flake-utils/846b2ae0fc4cc943637d3d1def4454213e203cba' (2022-01-20)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/b2737d4980a17cc2b7d600d7d0b32fd7333aca88' (2022-01-11)
  → 'github:nixos/nixpkgs/945ec499041db73043f745fad3b2a3a01e826081' (2022-01-26)
 2022-01-29 17:35:50 +03:00
swirl
5abb97362f Merge pull request #102 from dada513/rework_docs 
docs: rework README and BUILD
 2022-01-29 09:24:08 -05:00
DioEgizio
b34239ebc6 adoptium 2022-01-29 11:00:13 +01:00
DioEgizio
7ef6c586c5 update readme 2022-01-29 10:59:04 +01:00
DioEgizio
9d36cf4b5a fix another typo (omg I'm doing too commits) 2022-01-29 10:26:13 +01:00
DioEgizio
04be2404ce fix typo 2022-01-29 10:24:49 +01:00
DioEgizio
7f4fd04cfe not needed actually 2022-01-29 10:24:06 +01:00
DioEgizio
b2bcdb9d9b fix a typo+explain better 2022-01-29 10:18:12 +01:00
DioEgizio
d81e2bb0b0 extra refinements 2022-01-29 10:14:00 +01:00
DioEgizio
177c10bb0f fix MacOS build instructions 2022-01-29 10:12:04 +01:00
dada513
304775952f EVEN MORE BASED 2022-01-29 09:40:27 +01:00
dada513
ca00103ee2 make packaging based 2022-01-29 08:56:04 +01: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
swirl
f36930d812 Merge pull request #107 from redstrate/fix_icon_bug 
Fix icons changing when exiting the settings window
 2022-01-28 09:31:41 -05:00
dada513
232295bda7 add gentoo instructions 2022-01-28 09:12:55 +01:00
dada513
451768ccf9 Merge remote-tracking branch 'upstream/develop' into rework_docs 2022-01-28 09:10:47 +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
ad6e3a0868 Fix meta 2022-01-27 16:58:28 -05:00
dada513
14a8ead6b4 fix conflict 2022-01-27 19:01:20 +01:00
dada513
bbf0508846 docs: rework README and BUILD 2022-01-27 18:59:44 +01:00
swirl
79314ee67b Merge pull request #103 from redstrate/fix_rpm_build 
Fix RPM build instructions
 2022-01-27 12:43:54 -05:00
swirl
86b0637ef7 Merge pull request #101 from redstrate/fix_freedesktop_icon 
Fix Freedesktop icons
 2022-01-27 09:56:39 -05:00
redstrate
1c982b0182 Fix RPM build instructions 2022-01-27 13:17:26 +00:00
Joshua Goins
cd5faee7d7 Fix RPM spec referencing old desktop file 2022-01-27 08:06:35 -05:00
Joshua Goins
ec1e27031a Fix Freedesktop icons 
This fixes #51. The desktop file is now exactly the same as the window class,
which is also now corrected to org.polymc.polymc. The file capitalization
is also consistent with other Freedesktop files as well.
 2022-01-27 00:08:53 -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
Lenny McLennington
0eff21a4f1 Validate Pastebin URL with regex 2022-01-26 00:34:02 +00:00
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
Petr Mrázek
63d4486855 Merge pull request #4447 from Stypox/patch-1 
Fix error message
 2022-01-24 10:32:14 +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
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
af20b5ee0e support paste.polymc.org 2022-01-23 12:54:58 -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
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