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

3988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sefa Eyeoglu
b191291737 Merge pull request #577 from PolyMC/fix/toolbar_🦀_fix 2022-05-22 18:11:00 +02:00
DioEgizio
c988b4d213 fix appimage not having imageformats 
fixes stuff like the iris icon
 2022-05-22 17:26:27 +02:00
Sefa Eyeoglu
90007e2d9d fix: temporarily ignore stringop-overflow warning 2022-05-22 16:13:30 +02:00
Sefa Eyeoglu
29ef1e2c4b Merge pull request #597 from Scrumplex/refactor-modloader-modapi 2022-05-22 13:17:53 +02:00
txtsd
fbe84f9e47 Merge pull request #614 from txtsd/ccache_release_fix 
Avoid invoking ccache on Release builds
 2022-05-22 16:16:14 +05:30
timoreo22
b036d95bab Merge pull request #576 from kthchew/feature/win-installer 
Create Windows installer
 2022-05-22 12:26:43 +02:00
txtsd
bfffcb3910 fix(workflow): Avoid invoking ccache on Release builds 2022-05-22 13:42:33 +05:30
Ezekiel Smith
bc450e4cee Merge pull request #612 from DioEgizio/update-cf-logo-real 
change cf icon to a more fancy one
 2022-05-21 09:53:31 -07:00
LennyMcLennington
de02deac98 Make if statement condition more readable 
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
 2022-05-21 17:30:54 +01:00
Lenny McLennington
e2ad3b0183 Add migration wizard, fix migration from custom paste instance 
- Very basic wizard just to allow the user to choose whether to keep
  their old paste settings or use the new default settings.

- People who used custom 0x0 instances would just be kept on those
  settings and won't see the wizard.
 2022-05-21 17:30:19 +01:00
Lenny McLennington
caf6d02728 Change paste settings and add copyright headers 
- There's now a notice reminding people to change the base URL if they
  had a custom base URL and change the paste type (that was something I
  personally had problems with when I was testing, so a reminder was
  helpful for me).

- Broke down some of the long lines on APIPage.cpp to be more readable.

- Added copyright headers where they were missing.

- Changed the paste service display names to the names they are more
  commonly known by.

- Changed the default hastebin base URL to https://hst.sh due to the
  acquisition of https://hastebin.com by Toptal.
 2022-05-21 17:30:09 +01:00
Lenny McLennington
35f71f5793 Support paste.gg, hastebin, and mclo.gs 2022-05-21 17:28:22 +01:00
DioEgizio
b2a89ee4b9 change cf icon to a more fancy one 
taken from QuiltMC/art in the emoji folder, so it's licensed under CC0
 2022-05-21 17:49:52 +02:00
Jamie Mansfield
b84d52be3d ATLauncher: Display warnings when selecting optional mods 2022-05-21 15:20:38 +01:00