leo78913
|
e4b5cd23e6
|
the trashcan icons dont look like trash now
Signed-off-by: leo78913 <leo3758@riseup.net>
|
2022-10-21 13:49:31 -03:00 |
|
leo78913
|
8db89b4cfb
|
Merge branch 'PrismLauncher:develop' into menu-icons
|
2022-10-20 17:54:43 -03:00 |
|
leo78913
|
31dc92dafe
|
add icons to the instance menu and 4 new icons:
delete
rename
tag
export
Signed-off-by: leo78913 <leo3758@riseup.net>
|
2022-10-20 17:48:57 -03:00 |
|
Sefa Eyeoglu
|
5e86a34925
|
Merge pull request #184 from Chrono-byte/develop
|
2022-10-20 21:52:24 +02:00 |
|
Chrono-byte
|
ece206b81c
|
Remove erroneous space
Signed-off-by: Chrono-byte <me@disilla.org>
|
2022-10-20 15:22:04 -04:00 |
|
Chrono-byte
|
88341b923a
|
fix contributor notices in AboutDialog.cpp for license compliance
Signed-off-by: Chrono-byte <me@disilla.org>
|
2022-10-20 15:14:26 -04:00 |
|
DioEgizio
|
a9d4370ad4
|
Merge pull request #47 from TheOPtimal/develop
|
2022-10-20 10:01:46 +02:00 |
|
Sefa Eyeoglu
|
8a0318c779
|
Merge pull request #119 from Scrumplex/update-readme-sponsors
|
2022-10-20 09:59:00 +02:00 |
|
Sefa Eyeoglu
|
8e754d9a56
|
fix: update README
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-20 09:54:23 +02:00 |
|
Sefa Eyeoglu
|
0e209dcb02
|
Merge pull request #148 from ZombieNub/prismlauncher-rename
|
2022-10-20 09:44:25 +02:00 |
|
Zeke
|
6f2d6425a2
|
update meta to not break flatpak
Signed-off-by: Zeke <ezekielsmith@protonmail.com>
|
2022-10-20 16:54:57 +10:00 |
|
TheOPtimal
|
b6aa33f3a6
|
Add Matrix Room
Co-authored-by: Fayne Aldan <FayneAldan@gmail.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
|
2022-10-20 09:13:37 +04:00 |
|
TheOPtimal
|
ab68d9198d
|
PrismLauncher → Prism Launcher (again)
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
|
2022-10-20 09:13:37 +04:00 |
|
TheOPtimal
|
32eebd3ca7
|
PrismLauncher → Prism Launcher
Co-authored-by: Fayne Aldan <FayneAldan@gmail.com>
Co-authored-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
|
2022-10-20 09:13:37 +04:00 |
|
TheOPtimal
|
3f2e5633b4
|
Add OpenCollective
Co-authored-by: Fayne Aldan <FayneAldan@gmail.com>
Signed-off-by: TheOPtimal <41379516+TheOPtimal@users.noreply.github.com>
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
|
2022-10-20 09:13:37 +04:00 |
|
Jacob Gogichaishvili
|
a99b9e80b8
|
Remove PolyMC's OpenCollective
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
|
2022-10-20 09:13:37 +04:00 |
|
Jacob Gogichaishvili
|
42ed7e4626
|
Remove Matrix room link until one is created
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
|
2022-10-20 09:13:37 +04:00 |
|
Jacob Gogichaishvili
|
ae910eea62
|
Change issue templates to Prism branding
Signed-off-by: Jacob Gogichaishvili <iakob.gogichaishvili@gmail.com>
|
2022-10-20 09:13:37 +04:00 |
|
flow
|
d35920f356
|
Merge pull request #123 from MMK21Hub/patch-1
|
2022-10-19 22:00:23 -03:00 |
|
IroncladLandship
|
c29e7477f0
|
Merge branch 'develop' into prismlauncher-rename
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com>
|
2022-10-19 19:21:08 -05:00 |
|
flow
|
86bbc7939c
|
Merge pull request #100 from TheEvilSkeleton/improve-approachability
|
2022-10-19 21:15:37 -03:00 |
|
Jackson Huffstutler
|
d7478c14fd
|
Renamed inappropriate instances of "PrismLauncher" to "Prism Launcher"
Signed-off-by: IroncladLandship <jack.huffstutler@gmail.com>
|
2022-10-19 16:03:18 -05:00 |
|
TheEvilSkeleton
|
297c593edd
|
Improve approachability
Signed-off-by: TheEvilSkeleton <theevilskeleton@riseup.net>
|
2022-10-19 15:10:35 -04:00 |
|
MMK21Hub
|
6439ef11aa
|
Fix incorrect release titles
Signed-off-by: MMK21Hub <KAGfan2018@outlook.com>
|
2022-10-19 19:21:48 +01:00 |
|
Sefa Eyeoglu
|
41032aaac2
|
Merge pull request #110 from Scrumplex/fix-nsis-shortcut
|
2022-10-19 14:28:36 +02:00 |
|
Sefa Eyeoglu
|
4e08f28246
|
Merge pull request #31 from flowln/who_needs_webview
|
2022-10-19 14:28:29 +02:00 |
|
Sefa Eyeoglu
|
46c57e120f
|
Merge pull request #27 from flowln/ftb_install_improve
|
2022-10-19 13:51:35 +02:00 |
|
Sefa Eyeoglu
|
6b52ee61ae
|
Merge pull request #92 from Scrumplex/new-logo
|
2022-10-19 13:41:56 +02:00 |
|
Sefa Eyeoglu
|
61fbc5a791
|
refactor: replace with new logo
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-19 13:08:23 +02:00 |
|
Sefa Eyeoglu
|
22365205f9
|
fix: use display name for NSIS
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
|
2022-10-19 12:17:06 +02:00 |
|
DioEgizio
|
c6515c1dad
|
Merge pull request #54 from Samisafool/develop
|
2022-10-19 12:13:13 +02:00 |
|
Samisafool
|
8201d1df02
|
Rename
Signed-off-by: Samisafool <thenerdiestguy@gmail.com>
|
2022-10-19 15:02:43 +05:30 |
|
timoreo
|
ddf168c536
|
Merge pull request #75 from Gideon9212/develop
|
2022-10-19 06:27:09 +02:00 |
|
Gideon9212
|
c9f81f56e9
|
Fix banner
Removed boosted URL for plain
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
|
2022-10-18 18:35:03 -07:00 |
|
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 |
|
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 |
|