CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,352 Commits 10 Branches 30 Tags 34 MiB
9539230915
Commit Graph

5352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
flow
01b90809e8
fix: memory leak when finishing blocked mods job 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 16:55:22 -03:00
flow
0a7383a4e1
fix: hide ProgressDialog when failing/succeeding tasks 
WHY IS QT LIKE THAT AAAAAAAA

Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 16:54:39 -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
flow
5d27633821
fix: show a single line in ProjectItem's desc. when there's no more space 
Signed-off-by: flow <flowlnlnln@gmail.com>
 2022-10-20 15:03:46 -03: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
Sebastian Rueth
b46c4a81e0
check space requirements of project description 
if there isn't enough space for 2 lines of project description, only
draw one

Signed-off-by: Sebastian Rueth <sebastian.rueth@protonmail.com>
 2022-10-20 08:02:05 +02: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
Skyler Grey
dab091a7b7
Update NIX.md so it has more methods + is clearer 
- Add proper headings
- Change flake codeblocks so that configuration stuff isn't in the same
  place as flake.nix stuff
- Add instructions for not using the overlay with flakes
- Add instructions for running ad-hoc with flakes

Signed-off-by: Skyler Grey <skyler3665@gmail.com>
 2022-10-19 23:50:48 +01:00
Skyler Grey
513d93cfc7
Change the derivation to have parity with nixpkgs 
- Symlink rather than copying libraries
- Update maintainers
- Reformat with nixpkgs-fmt

Signed-off-by: Skyler Grey <skyler3665@gmail.com>
 2022-10-19 23:48:56 +01: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
flow
d6479e133d fix: properly center project descriptions 
In particular, this takes into account the space used by the title, so
(hopefully) there won't be problems with custom themes with that.

Signed-off-by: flow <flowlnlnln@gmail.com>
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
 2022-10-19 20:12:50 +02:00
Sebastian Rüth
50bbf2aacc fix text clipping 
Signed-off-by: Sebastian Rüth <sebastian.rueth@protonmail.com>
 2022-10-19 20:12:50 +02: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