Regular Baf
54e4f88ada
Attempt implementing the new discord logo
2022-04-09 13:00:27 +00:00
dada513
8a2c5f5b0d
Merge pull request #407 from DioEgizio/upstream-cherrypick
2022-04-08 16:18:28 +02:00
DioEgizio
66caac0bbc
Update launcher/JavaCommon.cpp
...
Co-authored-by: Sefa Eyeoglu <contact@scrumplex.net>
2022-04-08 11:16:00 +02:00
Sefa Eyeoglu
ab8d897bd7
Merge pull request #409 from flowln/tasks
2022-04-08 09:45:06 +02:00
DioEgizio
3024dbcf2c
Apply suggestion
...
Co-authored-by: Kenneth Chew <79120643+kthchew@users.noreply.github.com>
2022-04-08 08:50:32 +02:00
flow
eeae3eca67
test: add new test to Task test
...
Also adds one more check to setStatus test
2022-04-07 19:42:26 -03:00
flow
d0cda6d605
test: add basic Task unit test
...
Only only two tests for now. We can iterate on this later :^)
This is to try to avoid breaking things again!
2022-04-07 19:08:01 -03:00
flow
167e32a69f
fix: allow aborting CF modpack importing
2022-04-07 18:56:34 -03:00
flow
be2512bb4b
fix: issue with status of non-sequencial tasks
2022-04-07 18:41:32 -03:00
Sefa Eyeoglu
c3f1c13a31
Merge pull request #272 from Kranzes/develop
2022-04-07 20:30:26 +02:00
Vladislav Laetansky
1811302deb
NOISSUE save custom offline player name
2022-04-07 18:29:15 +02:00
Petr Mrázek
e6564aa69f
NOISSUE fix error string for Xbox authorization failures
2022-04-07 18:29:10 +02:00
Petr Mrázek
566a83b245
NOISSUE prevent -version being passed to the JRE
...
We want specific JREs, always, not something that is magically resolved.
This counteracts some really bad advice recently being spread on reddit.
2022-04-07 18:28:27 +02:00
Ezekiel Smith
cc5261051f
Merge pull request #364 from Scrumplex/fix-i18n2
...
Fix translatable strings 2
2022-04-07 23:20:54 +10:00
Sefa Eyeoglu
fa870bc026
Merge pull request #380 from flowln/task-progress
2022-04-06 10:52:38 +02:00
Sefa Eyeoglu
99d569ed0e
Merge pull request #384 from jamierocks/technic-improvements
2022-04-06 10:52:27 +02:00
Sefa Eyeoglu
a1a7b9c151
Merge pull request #397 from DioEgizio/manymc-detect-aarch64
2022-04-06 10:52:15 +02:00
Una
dc6340bf38
Allow components to specify Java agents and JVM arguments ( #175 )
2022-04-06 08:22:24 +02:00
dada513
8732bea99b
Merge pull request #395 from HarryPeach/develop
2022-04-05 18:01:00 +02:00
Sefa Eyeoglu
bbc6b71138
Merge pull request #389 from DioEgizio/CI/remove-useless-deadcode
2022-04-04 21:03:34 +02:00
Sefa Eyeoglu
5fb096d7b9
Merge pull request #345 from Scrumplex/handle-incompatible-java
2022-04-04 21:01:49 +02:00
Victor
cf8680f1ab
fix: properly detect arm64
2022-04-04 16:41:23 +02:00
Sefa Eyeoglu
115d8b5945
Merge pull request #390 from PolyMC/ZekeSmith-patch-matrix-reddit
...
Update matrix and add reddit links
2022-04-04 09:39:40 +02:00
Harry Peach
bd8b61651a
Check for empty slug before setting pack url
2022-04-03 23:12:46 +01:00
DioEgizio
d2ffaee9f8
remove deadcode in CI
2022-04-03 14:43:02 +02:00
Sefa Eyeoglu
8f61633551
Merge pull request #381 from Scrumplex/merge-stable
2022-04-03 13:21:58 +02:00
Ezekiel Smith
d33d5b847d
Merge pull request #387 from Scrumplex/fix-world-size
...
fix: calculate world sizes individually
2022-04-03 20:45:23 +10:00
Ezekiel Smith
c8879df621
Merge pull request #385 from PolyMC/ZekeSmith-patch-1
...
Update README.md
2022-04-03 20:42:34 +10:00
Ezekiel Smith
c367769781
Update CMakeLists.txt
2022-04-03 20:39:44 +10:00
Ezekiel Smith
02b44256b2
Fix matrix links and add reddit
2022-04-03 20:37:50 +10:00
Jamie Mansfield
b6e722a048
BuildConfig: Make Technic API base URL and build constants
2022-04-02 13:53:44 +01:00
Jamie Mansfield
7f2615b2a5
Technic: Verify checksums for pack build mods
2022-04-02 13:53:44 +01:00
Jamie Mansfield
a232c2d509
Technic: Display available versions for Solder packs
2022-04-02 13:53:44 +01:00
Jamie Mansfield
c8205fda9f
Technic: Replace inline parsing code with API models
2022-04-02 13:53:44 +01:00
Jamie Mansfield
8df88e7fbb
Technic: Add API models for Solder packs
2022-04-02 13:53:44 +01:00
Jamie Mansfield
c8092269ba
Technic: Match CurseForge pack description format
2022-04-02 13:53:44 +01:00
Jamie Mansfield
9d88f07955
Technic: Include the modpack version in instance title
2022-04-02 13:53:43 +01:00
Jamie Mansfield
f267375ac2
Technic: Prevent potential HTML injection
2022-04-02 13:53:43 +01:00
Jamie Mansfield
d44fa416ca
Technic: Allow pack API urls to be used in search
...
This mimics the behaviour that the Technic launcher has, and their
website displays API URLs for.
The big benefit of this, is to be able to install private packs now :)
2022-04-02 13:53:43 +01:00
Sefa Eyeoglu
41d7b27d43
fix: calculate world sizes individually
2022-04-02 13:29:37 +02:00
Ezekiel Smith
5f461374b8
Update README.md
2022-04-02 17:25:49 +10:00
timoreo22
d5576779b7
Merge pull request #383 from PolyMC/ZekeSmith-license
...
Update License
2022-04-02 06:11:48 +02:00
Ilan Joselevich
c098be40ab
flake.lock: Update
...
Flake lock file updates:
• Updated input 'flake-compat':
'github:edolstra/flake-compat/b7547d3eed6f32d06102ead8991ec52ab0a4f1a7' (2022-01-03)
→ 'github:edolstra/flake-compat/64a525ee38886ab9028e6f61790de0832aa3ef03' (2022-03-25)
• Updated input 'nixpkgs':
'github:nixos/nixpkgs/e9545762b032559c27d8ec9141ed63ceca1aa1ac' (2022-03-10)
→ 'github:nixos/nixpkgs/30d3d79b7d3607d56546dd2a6b49e156ba0ec634' (2022-03-25)
2022-04-02 02:35:44 +03:00
Sefa Eyeoglu
333f7cc320
Merge pull request #373 from Scrumplex/feat-world-size
2022-04-02 00:59:15 +02:00
Sefa Eyeoglu
9180c751d8
fix(launch/VerifyJava): reword log output
2022-04-02 00:54:48 +02:00
Ezekiel Smith
131a04653f
Update License
2022-04-02 07:52:07 +10:00
Ilan Joselevich
6e6d495bc7
nix: build with latest jdk version
2022-04-01 16:55:51 +03:00
Ilan Joselevich
2c07f758a0
nix: refactor flake (drop flake-utils)
2022-04-01 16:55:51 +03:00
Sefa Eyeoglu
251f0efec2
Merge remote-tracking branch 'upstream/stable' into develop
2022-04-01 15:33:33 +02:00
Sefa Eyeoglu
e8697068fb
fix: codestyle
2022-04-01 15:00:05 +02:00