Ryan Cao
2d68235e55
Merge branch 'develop' into global-jvm-args
2022-05-28 21:15:19 +08:00
Ryan Cao
2be8100e7c
Merge branch 'develop' into global-jvm-args
2022-05-28 21:15:00 +08:00
Sefa Eyeoglu
ab3e2562db
fix: clarify terms and conditions for API keys
2022-05-28 13:52:22 +02:00
Mustafa Çalışkan
123d6c72e4
nix: fix nix-build
2022-05-28 11:32:16 +03:00
Mustafa Çalışkan
0ea2135aa5
nix: initial support for qt6
2022-05-28 11:32:13 +03:00
Jeremy Lorelli
48e20cb5f7
Fix crash when aborting instance import
...
Also turned a loop var into a reference to avoid copies on each iteration
2022-05-27 16:41:57 -07:00
Mustafa Çalışkan
0ffe0b6894
nix: move files to nix/
2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
338156500b
nix: override msa id via cmake flag
2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
bfd9bd43c9
flake.lock: update
...
• Updated input 'flake-compat':
'github:edolstra/flake-compat/64a525ee38886ab9028e6f61790de0832aa3ef03' (2022-03-25)
→ 'github:edolstra/flake-compat/b4a34015c698c7793d592d66adbab377907a2be8' (2022-04-19)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/30d3d79b7d3607d56546dd2a6b49e156ba0ec634' (2022-03-25)
→ 'github:nixos/nixpkgs/41cc1d5d9584103be4108c1815c350e07c807036' (2022-05-23)
• Removed input 'quazip'
2022-05-27 22:56:42 +03:00
Mustafa Çalışkan
283e50e670
nix: use nixpkgs's quazip
2022-05-27 22:56:40 +03:00
Sefa Eyeoglu
6fb5bb6a5e
fix: fix mnemonics in APIPage
2022-05-27 14:50:06 +02:00
flow
5d3bef32ca
fix: use absolute path when installing icons
2022-05-27 09:15:32 -03:00
flow
3ff26d5cfe
Merge pull request #642 from ryanccn/metaserver-show-default
...
Show default metaserver in settings
2022-05-26 20:09:07 -03:00
flow
88c1e504b0
Merge pull request #618 from DioEgizio/patch-6
...
fix appimage not having imageformats
2022-05-26 20:03:03 -03:00
Sefa Eyeoglu
0263677e1f
fix: prefer stricter modpack formats during import
...
Flame modpacks use "manifest.json" as their only characteristic for
identification. Some modpacks might have other files called
"manifest.json", which is why we should prefer modpack formats that have
a stricter structure.
2022-05-26 22:41:20 +02:00
Sefa Eyeoglu
940455f81c
Merge pull request #645 from PolyMC/revert-609-feature/fix-blocked-modpacks
2022-05-26 19:20:39 +02:00
Ryan Cao
f541ea659c
better new icon
2022-05-26 18:16:32 +08:00
Sefa Eyeoglu
938cae1130
revert: remove CurseForge workaround for packs too
...
Partial revert. Handles missing download URLs.
2022-05-25 23:14:13 +02:00
Sefa Eyeoglu
7f73e57c67
Merge pull request #630 from jamierocks/h-atl-depends
2022-05-25 14:52:34 +02:00
Ryan Cao
e50ec31351
fix
2022-05-25 14:44:47 +08:00
Ryan Cao
a28fa219d7
fix indent width
2022-05-25 14:21:09 +08:00
Ryan Cao
8a1ba03bcb
show default metaserver
2022-05-25 11:46:15 +08:00
Sefa Eyeoglu
e8b7e70ec9
Merge pull request #637 from byquanton/patch-1
2022-05-24 20:53:19 +02:00
byquanton
67c5aa0be9
Update org.polymc.PolyMC.metainfo.xml.in
...
Should fix Flatpak/Flathub build
2022-05-24 17:44:23 +02:00
Ryan Cao
17b30b2ae2
clean up .clang-format
2022-05-24 22:37:00 +08:00
Sefa Eyeoglu
3cc26b15a1
Merge pull request #631 from kthchew/fix/quazip-warn
2022-05-24 10:25:04 +02:00
Kenneth Chew
fce5c57548
Silence CMake QuaZip not found warnings
...
These are expected most of the time, and thus just noise.
2022-05-23 17:27:35 -04:00
Jamie Mansfield
4ee5264e24
ATLauncher: Delete files from configs if they conflict with a mod
2022-05-23 21:44:01 +01:00
Jamie Mansfield
101ca60b2b
ATLauncher: Handle extra arguments depends
2022-05-23 20:57:15 +01:00
Jamie Mansfield
f28a0aa666
ATLauncher: Handle main class depends
2022-05-23 20:57:14 +01:00
Kenneth Chew
997bf91442
Add desktop shortcut to Windows installer
2022-05-23 14:15:49 -04:00
Ryan Cao
c3e6b1aa8a
use light bigsur icon
2022-05-23 18:40:46 +08:00
Ryan Cao
6d0ea13f97
make JVM args PlainTextEdit
2022-05-23 16:52:12 +08:00
Sefa Eyeoglu
dca4ea5cea
Merge pull request #621 from Scrumplex/remove-curseforge-workarounds
2022-05-23 10:47:30 +02:00
txtsd
be1e2c07ec
Merge pull request #622 from Scrumplex/chore-bump-1.3.0
...
Bump version to 1.3.0
2022-05-23 08:44:56 +05:30
Ryan Cao
2a0018e730
add a .clang-format
2022-05-23 08:29:30 +08:00
flow
ac4497a1f2
Merge pull request #605 from jamierocks/h-atl-improv
...
ATLauncher: Various work to improve the platform support
2022-05-22 20:09:13 -03:00
Sefa Eyeoglu
d72c75db23
chore: bump version
2022-05-22 22:56:52 +02:00
Sefa Eyeoglu
6821a45b7f
Merge pull request #620 from Scrumplex/update-cxxflags
2022-05-22 22:55:04 +02:00
Sefa Eyeoglu
f24cdd6564
Merge pull request #425 from dada513/dynamic_meta
2022-05-22 22:47:00 +02:00
Sefa Eyeoglu
cb69869836
revert: remove CurseForge workaround
...
We have been asked by CurseForge to remove this workaround as it
violates their terms of service. This is just a partial revert, as the
UI changes were otherwise unrelated.
This reverts commit 92e8aaf36f
, reversing
changes made to 88a93945d4
.
2022-05-22 22:07:03 +02:00
Sefa Eyeoglu
0b85051a23
fix: more generous optimizations for debug builds
2022-05-22 21:41:41 +02:00
Sefa Eyeoglu
f2e2053134
feat: add trailing slash to meta URL if it is missing
2022-05-22 21:36:31 +02:00
Sefa Eyeoglu
b181f4bc30
fix: improve spacing in APIPage
2022-05-22 21:36:30 +02:00
dada513
f00dbdc215
Make Metaserver changable in settings
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
Co-authored-by: flow <flowlnlnln@gmail.com>
2022-05-22 21:35:20 +02:00
Sefa Eyeoglu
309dcc82ca
Revert "fix: temporarily ignore stringop-overflow warning"
...
This reverts commit 90007e2d9d
.
2022-05-22 20:57:52 +02:00
Sefa Eyeoglu
0922a7f410
refactor: use -O2 for release and -O1 for debug builds
2022-05-22 20:50:37 +02:00
Sefa Eyeoglu
7d91db607f
Merge pull request #554 from PolyMC/more_paste_services
2022-05-22 20:49:11 +02:00
DioEgizio
2be583ad4d
Merge branch 'PolyMC:develop' into patch-6
2022-05-22 20:03:10 +02:00
timoreo22
efcba698ac
Merge pull request #616 from Scrumplex/fix-windows-crap
...
fix: temporarily ignore stringop-overflow warning
2022-05-22 18:43:31 +02:00