0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,042 Commits 1 Branch 0 Tags
46e403b20b8f14269aebc163f2bc481d3dea43c5
Commit Graph

4042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flow
46e403b20b fix: properly parse mrpacks without the 'env' field 
It's optional, so some files may not have it (like most of FO).
 2022-06-09 19:53:29 -03:00
txtsd
309013efb3 Merge pull request #762 from muscaln/flake 
Bump flake lock
 2022-06-09 05:58:42 +05:30
txtsd
705cf6499e Merge pull request #734 from babbaj/extra-jdks 
nix: add package argument for extra jdks
 2022-06-09 05:57:23 +05:30
Mustafa Çalışkan
6ee5ee496e flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/41cc1d5d9584103be4108c1815c350e07c807036' (2022-05-23)
  → 'github:nixos/nixpkgs/43ecbe7840d155fa933ee8a500fb00dbbc651fc8' (2022-06-08)
 2022-06-08 14:32:08 +03:00
Babbaj
3f1251e78b nix: add package argument for extra jdks 2022-06-06 22:13:10 -04:00
flow
8966364648 Merge pull request #685 from kthchew/fix/technic-quilt 
Add Quilt support for Technic modpacks
 2022-06-06 18:03:05 -03:00
Sefa Eyeoglu
db1c804812 Merge pull request #718 from DioEgizio/revert-unfunny-pr 2022-06-04 21:49:15 +02:00
flow
493d58f358 Merge pull request #719 from RaptaG/patch-1 
Capitalization fix in the README
 2022-06-04 16:16:15 -03:00
RaptaG
fcd56dddc2 Capitalization fix 2022-06-04 22:08:35 +03:00
DioEgizio
91b85f9919 Revert "Merge pull request #315 from txtsd/display_scaling" 
This reverts commit fcf728f3b5.
 2022-06-04 17:09:11 +02:00
Sefa Eyeoglu
1ab00ca8b2 Merge pull request #426 from flowln/mod_perma 
Add on-disk mod metadata information
 2022-06-04 13:23:38 +02:00
TheOPtimal
cf4949b4f5 Prepare for Nix 2.7 (#286) 
* Prepare for Nix 2.7

* Fix embarassing oopsie
 2022-06-03 22:26:46 -03:00
Sefa Eyeoglu
4ca634d229 Merge pull request #701 from jn64/patch-1 
Add "mc" keyword to desktop file
 2022-06-03 09:30:36 +02:00
jn64
ca21b31696 Add "mc" keyword to desktop file 
Certain launchers (e.g. GNOME) only search from word boundaries, so typing "mc" doesn't currently match to "PolyMC".
 2022-06-03 09:58:57 +08:00
Sefa Eyeoglu
147bde5294 Merge pull request #692 from glowiak/patch-6 2022-06-01 17:46:12 +02:00
glowiak
1a004f0c4d Update MCEditTool.cpp 2022-06-01 15:50:43 +02:00
glowiak
7d21bf15e8 Update UpdateController.cpp 2022-06-01 15:50:02 +02:00
Sefa Eyeoglu
a88ad8025b Merge pull request #682 from istudyatuni/fix-add-account-behaviour 2022-06-01 10:13:35 +02:00
Sefa Eyeoglu
04a3669fc4 Merge pull request #687 from PolyMC/LennyMcLennington-patch-1 
Change forking policy a bit
 2022-05-31 08:22:33 +02:00
LennyMcLennington
795075f90d Update README.md 2022-05-30 23:59:48 +01:00
LennyMcLennington
2727df704f change the wording a bit 2022-05-30 23:52:12 +01:00
LennyMcLennington
8ce8aadd9b fix typo 2022-05-30 23:50:35 +01:00
LennyMcLennington
2999e69f0f Change forking policy a bit 
Ask people forking PolyMC to make it clear that their fork is not endorsed by us.
 2022-05-30 23:05:29 +01:00
Kenneth Chew
7ac16ed073 Use QStringList instead of QSet<QString> 
Co-authored-by: flow <flowlnlnln@gmail.com>
 2022-05-30 14:40:20 -04:00
Kenneth Chew
3585e4764b Add Quilt support for Technic modpacks 2022-05-30 14:14:03 -04:00
Sefa Eyeoglu
9054ee18a1 Merge pull request #505 from flowln/improve_download_ux 2022-05-30 13:41:02 +02:00
Ilia
9d8b95107d fix: do not show the "profile select" dialog if the user refused to add an account 2022-05-30 13:33:07 +03:00
Sefa Eyeoglu
d7fad4bd04 Merge pull request #677 from timoreo22/fix-modrinth-link 
Fix modrinth search filters
 2022-05-29 18:36:03 +02:00
timoreo
2746251dcd Fix modrinth search filters 2022-05-29 18:23:34 +02:00
Sefa Eyeoglu
73e46e569f Merge pull request #662 from Scrumplex/chore-bump-1.3.1 2022-05-29 17:05:02 +02:00
flow
4f0f74d201 Merge pull request #675 from muscaln/nix 
Nix updates
 2022-05-29 11:21:47 -03:00
Sefa Eyeoglu
adf1e1982a fix: remove unnecessary translation (#674) 2022-05-29 16:14:01 +02:00
Sefa Eyeoglu
f5405e835e Merge pull request #624 from ryanccn/global-jvm-args 
Make global JVM arguments multi-line
 2022-05-29 16:10:55 +02:00
Sefa Eyeoglu
85ee7fb3a4 Merge pull request #672 from Scrumplex/fix-ftblegacy-pack-version 
fix: add version to Legacy FTB packs
 2022-05-29 16:10:43 +02:00
Mustafa Çalışkan
ee00a5d8ee nix: make LTO optional 2022-05-29 17:07:12 +03:00
Sefa Eyeoglu
65d23fc9b9 Merge pull request #671 from Scrumplex/fix-importing-flame-mmc-packs 2022-05-29 15:15:18 +02:00
txtsd
3448d7cb70 Merge pull request #659 from Scrumplex/fix-apikey-tos 
Clarify terms and conditions for API keys
 2022-05-29 18:44:32 +05:30
Sefa Eyeoglu
db1abb02d6 Merge pull request #661 from flowln/wow_curseforge_is_being_uncompetitive_im_so_surprised 2022-05-29 14:42:49 +02:00
Ezekiel Smith
36d78577e2 Merge pull request #669 from Scrumplex/fix-binary-version-windows 
Set version for Windows binaries
 2022-05-29 22:37:23 +10:00
Ryan Cao
20832682ef Update launcher/ui/pages/global/JavaPage.cpp 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-05-29 20:35:57 +08:00
Sefa Eyeoglu
8e6c592ad9 fix: add version to Legacy FTB packs 2022-05-29 14:28:54 +02:00
Sefa Eyeoglu
0b3115997a fix: fix importing Flame/MMC packs 2022-05-29 14:16:13 +02:00
Sefa Eyeoglu
b07c5982e1 fix: set version for Windows binaries 2022-05-29 13:09:13 +02:00
Sefa Eyeoglu
4a0b0d8735 Merge pull request #653 from muscaln/nix 2022-05-29 13:08:56 +02:00
Sefa Eyeoglu
7b9f67f4b4 Merge pull request #667 from DioEgizio/patch-7 2022-05-29 13:07:25 +02:00
DioEgizio
577f17c916 remove vista support from the manifest 
we don't support qt <5.12 anymore anyways
 2022-05-29 09:45:20 +02:00
Ryan Cao
d4c1d62781 Update launcher/ui/pages/global/JavaPage.cpp 
Co-authored-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
 2022-05-29 12:15:20 +08:00
flow
f0ec165d42 feat: add warning of non-whitelisted URLs instead of a hard fail 
Based on people's votes on Discord :^)
 2022-05-28 18:04:16 -03:00
Lenny McLennington
abd240468e clean up validateDownloadUrl 2022-05-28 17:11:55 -03:00
flow
b5e00027d1 change: add 'gitlab.com' to whitelisted Modrinth modpack urls 2022-05-28 17:01:58 -03:00