Gideon9212
|
570264e1e9
|
Merge branch 'develop' into develop
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
|
2022-10-18 17:28:42 -07:00 |
|
flow
|
325e58d98c
|
Merge pull request #88 from FayneAldan/multimc-fallback
go all the way up the fork chain!
|
2022-10-18 19:27:24 -03:00 |
|
flow
|
23a2960aa3
|
Merge pull request #60 from jitterdev/develop
|
2022-10-18 18:53:30 -03:00 |
|
Fayne Aldan
|
888a87463e
|
Add fallback for multimc.cfg
Signed-off-by: Fayne Aldan <FayneAldan@gmail.com>
|
2022-10-18 14:40:34 -06:00 |
|
Sefa Eyeoglu
|
2ebaf46095
|
Merge pull request #82 from flowln/i_broke_something_again
|
2022-10-18 22:15:08 +02:00 |
|
flow
|
3a95a3b7c1
|
fix: don't take item from a possibly empty list
The list gets destroyed when we take the last object, so things explode.
😔
Signed-off-by: flow <flowlnlnln@gmail.com>
|
2022-10-18 16:51:42 -03:00 |
|
Gideon9212
|
c4edffb388
|
Update banner
Changed to Join instead of Support server.
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
|
2022-10-18 12:10:29 -07:00 |
|
Gideon9212
|
5eec7cc788
|
Change discord invite to a banner
To help direct people to support with a big banner.
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
|
2022-10-18 11:40:23 -07:00 |
|
DioEgizio
|
fb4cf0b75d
|
Merge pull request #55 from flowln/config_add_fallback
|
2022-10-18 19:50:34 +02:00 |
|
Sefa Eyeoglu
|
5584884fe6
|
Merge pull request #68 from nightsnowlinouo/develop
|
2022-10-18 19:43:02 +02:00 |
|
Sefa Eyeoglu
|
3bb1068ef0
|
Merge pull request #59 from CutestNekoAqua/bug-35
|
2022-10-18 19:26:57 +02:00 |
|
雪鈴 SnowLin
|
b1b85313ae
|
Fix hosted weblate translation website URL
Signed-off-by: 雪鈴 SnowLin <113241163+nightsnowlinouo@users.noreply.github.com>
|
2022-10-19 01:22:58 +08:00 |
|
he3als
|
92dfd659f1
|
Fix .QRC file for flat white icons
|
2022-10-18 17:54:26 +01:00 |
|
he3als
|
d87f743a2b
|
Add flat white icons
This is mainly for dark mode users, as I think that the regular colour of the flat icons do not look good with dark mode.
|
2022-10-18 17:49:35 +01:00 |
|
Jitter
|
aec3e7b0fc
|
correct non-proper noun
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
|
2022-10-18 11:14:27 -05:00 |
|
Sefa Eyeoglu
|
243600b75b
|
Merge pull request #61 from pog5/develop
|
2022-10-18 18:03:34 +02:00 |
|
Nightly
|
3d89d126d0
|
PlaceholderMC => PrismLauncher
Small Correction
Signed-off-by: Nightly <62222436+pog5@users.noreply.github.com>
|
2022-10-18 15:52:32 +00:00 |
|
Jitter
|
54281e53a1
|
Update README.md
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
|
2022-10-18 10:35:00 -05:00 |
|
Jitter
|
6befd2be81
|
Update README.md
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
|
2022-10-18 10:34:27 -05:00 |
|
Jitter
|
1f0ca9ed92
|
Update README.md
Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com>
|
2022-10-18 10:34:11 -05:00 |
|
Sefa Eyeoglu
|
f3db9c3920
|
Merge pull request #48 from flowln/fix_nbt
|
2022-10-18 17:31:46 +02:00 |
|
Cleo John
|
83ceb26151
|
Streamline Button changes to improve source readability.
|
2022-10-18 17:28:23 +02:00 |
|
flow
|
32cdfb871c
|
fix: add fallback for polymc.cfg
Signed-off-by: flow <flowlnlnln@gmail.com>
|
2022-10-18 12:22:42 -03:00 |
|
flow
|
801e7da5ee
|
feat: allow specifying fallbacks to INI files
Signed-off-by: flow <flowlnlnln@gmail.com>
|
2022-10-18 12:22:42 -03:00 |
|
flow
|
2cf1ab7ec5
|
Merge pull request #43 from SSUPII/develop
|
2022-10-18 11:31:38 -03:00 |
|
Sefa Eyeoglu
|
d049c1afaf
|
chore: update flake
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-18 16:28:30 +02:00 |
|
flow
|
9f45389bc1
|
Merge pull request #45 from NotNite/update-readme
|
2022-10-18 11:23:10 -03:00 |
|
flow
|
d875481969
|
fix: update libnbtplusplus submodule's URL
Signed-off-by: flow <flowlnlnln@gmail.com>
|
2022-10-18 11:11:34 -03:00 |
|
Sergio
|
17a1e1245c
|
Updated HTML tags to Markdown
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com>
|
2022-10-18 16:04:28 +02:00 |
|
Sergio
|
06d28c3eec
|
Updated project naming
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com>
|
2022-10-18 15:57:43 +02:00 |
|
NotNite
|
684982c25c
|
README: PlaceholderMC -> Prism Launcher
Also cleaned it up a bit to make my Markdown linter happy.
|
2022-10-18 09:52:36 -04:00 |
|
Sergio
|
421522a61a
|
Added further clarifications
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com>
|
2022-10-18 15:52:00 +02:00 |
|
Sergio
|
f3b29d67f4
|
Merge branch 'PrismLauncher:develop' into develop
|
2022-10-18 15:39:29 +02:00 |
|
Sergio
|
2ee5c6b2a1
|
Totally skipped a typo
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com>
|
2022-10-18 15:38:32 +02:00 |
|
Sergio
|
5083772c6f
|
Fixed markdown errors
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com>
|
2022-10-18 15:37:11 +02:00 |
|
Sergio
|
fd51e5df47
|
Added build instructions for Linux
Added build instructions in the main repository as a temporary reference
Signed-off-by: Sergio <42090377+SSUPII@users.noreply.github.com>
|
2022-10-18 15:35:40 +02:00 |
|
Sefa Eyeoglu
|
3405fd91c6
|
Merge pull request #33 from DioEgizio/remove-useless-actions
|
2022-10-18 15:31:32 +02:00 |
|
DioEgizio
|
194822f11e
|
Merge pull request #28 from flowln/fix_copy
|
2022-10-18 15:27:53 +02:00 |
|
Sefa Eyeoglu
|
98963d4cdf
|
Merge pull request #29 from Scrumplex/feat-clear-metadata
|
2022-10-18 15:25:56 +02:00 |
|
DioEgizio
|
804ef36b20
|
Merge pull request #26 from Scrumplex/armhf
|
2022-10-18 15:24:33 +02:00 |
|
Sefa Eyeoglu
|
3c6ff8fddf
|
Merge pull request #36 from DioEgizio/fix-copying
|
2022-10-18 15:05:31 +02:00 |
|
DioEgizio
|
511893d535
|
update COPYING
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2022-10-18 14:47:20 +02:00 |
|
DioEgizio
|
e05fe77bfe
|
feat: remove redundant actions from instance toolbar and redundant "instance"s
Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
|
2022-10-18 14:43:29 +02:00 |
|
DioEgizio
|
2b7b9a2abb
|
Merge pull request #25 from PlaceholderMC/fix-data-path
Fix Data path
|
2022-10-18 14:05:22 +02:00 |
|
Sefa Eyeoglu
|
6db3f68ae1
|
refactor: use correct data path
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-18 13:58:50 +02:00 |
|
timoreo
|
3773f2e7a5
|
Merge pull request #23 from PlaceholderMC/new-cf-key
|
2022-10-18 13:29:36 +02:00 |
|
Sefa Eyeoglu
|
1f8bffc15a
|
fix: new CurseForge key
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-18 13:24:57 +02:00 |
|
Sefa Eyeoglu
|
afaef4e83b
|
Merge pull request #13 from PlaceholderMC/rebrand
|
2022-10-18 13:05:24 +02:00 |
|
Sefa Eyeoglu
|
b746f723cb
|
fix: add Prism copyright header
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-18 13:01:32 +02:00 |
|
Sefa Eyeoglu
|
cfaf44f57b
|
fix: add sparkle public key
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-18 12:49:08 +02:00 |
|