0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,934 Commits 1 Branch 0 Tags
2e43d6cffa6c959ace96abacfc215691e84893ff
Commit Graph

2934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lenny McLennington
0c306d3676 update submodule 2021-12-21 00:03:43 +00: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
6d3eace2a8 NOISSUE fix up java dependency to 1.7 so builds work again 
'7' is not a thing
 2021-12-19 19:11:08 +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
5961c69019 Merge pull request #4321 from davispuh/java 
Update Java version to 7+
 2021-12-19 18:42:29 +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
Petr Mrázek
2f7fd221af Merge pull request #4367 from jamierocks/license-headers-jm 
NOISSUE Add license headers to source files created by me
 2021-12-19 18:35:43 +01:00
Petr Mrázek
1f4e3e83e3 Merge pull request #4364 from rfl890/patch-1 
Change from Oracle JDK to AdoptOpenJDK
 2021-12-19 18:35:32 +01:00
Petr Mrázek
fe12b58d06 Merge pull request #4373 from ImperatorStorm/update-man 
Fixed small oversight in README.md
 2021-12-19 18:29:50 +01:00
ImperatorStorm
d19ad15aec Fixed small oversight in README.md 2021-12-19 09:26:30 -08:00
rfl890
8bc3293ad0 Update BUILD.md 2021-12-19 07:59:19 -05:00
swirl
dcb57f1995 add Meson to todo 2021-12-18 11:29:24 -05:00
swirl
eb2e0b1617 remove references to MultiMC in issue templates 2021-12-18 11:20:25 -05:00
Lenny McLennington
551ac6139f update README.md 
update todo section
temporarily remove development section until we set up a community hub
 2021-12-18 15:09:54 +00:00
swirl
994b453a1c gpl 2021-12-18 14:33:17 +00: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
rfl890
7e1eb02ee6 Change from Oracle JDK to AdoptOpenJDK 
The Oracle JDK 8 is now offered at a commercial license and requires an account to download. OpenJDK has no such license and is completely free to use.
 2021-12-17 08:11:06 -05: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
298564ed71 Merge pull request #4327 from NewoIsTaken/patch-1 
NOISSUE Ignore Install Directory
 2021-12-10 20:49:00 +01:00
Owen Wang
871ceb21dd NOISSUE Ignore Install Directory 2021-12-10 14:03:38 -05:00
Dāvis Mosāns
c29b616497 Update Java version to 7+ 
Otherwise currently it doesn't build with newer Java
 2021-12-10 03:15:01 +02: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
cd513c02c4 NOISSUE bump version and update the changelog 2021-12-05 22:06:01 +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
kb1000
eb1091a5f4 NOISSUE Remove some unused code from InstanceView 2021-12-01 21:21:05 +01:00
Petr Mrázek
ffcef673de Merge pull request #4285 from khenriks/develop 
Fix instructions for building on Mac
 2021-11-30 20:24:19 +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
K Henriksson
20eada7bbe Fix instructions for building on Mac 
Relative paths and .. components don't work with CMake's bundle support.

The also adds a note about potential code signing problems.
 2021-11-28 10:44:51 -08:00
Petr Mrázek
859d710581 GH-4071 handle invalid MSA refresh token as a hard error 2021-11-28 19:01:21 +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