diff options
| author | Ryan Cao <70191398+ryanccn@users.noreply.github.com> | 2022-05-28 21:15:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-28 21:15:00 +0800 |
| commit | 2be8100e7cb625f3e6356a68f20291c5aa327c02 (patch) | |
| tree | eaf364705154e0457a1bde40dff8b2c8d843c8e5 /launcher/resources | |
| parent | 6d0ea13f97570f837f11022e3ef0fbfb6d0482f5 (diff) | |
| parent | 3ff26d5cfe293c635655d35e96d093ef0b383dc2 (diff) | |
| download | PrismLauncher-2be8100e7cb625f3e6356a68f20291c5aa327c02.tar.gz PrismLauncher-2be8100e7cb625f3e6356a68f20291c5aa327c02.tar.bz2 PrismLauncher-2be8100e7cb625f3e6356a68f20291c5aa327c02.zip | |
Merge branch 'develop' into global-jvm-args
Diffstat (limited to 'launcher/resources')
| -rw-r--r-- | launcher/resources/multimc/128x128/instances/flame.png | bin | 3375 -> 6226 bytes | |||
| -rw-r--r-- | launcher/resources/multimc/32x32/instances/flame.png | bin | 849 -> 0 bytes | |||
| -rw-r--r-- | launcher/resources/multimc/multimc.qrc | 4 |
3 files changed, 1 insertions, 3 deletions
diff --git a/launcher/resources/multimc/128x128/instances/flame.png b/launcher/resources/multimc/128x128/instances/flame.png Binary files differindex 8a50a0b4..6482975c 100644 --- a/launcher/resources/multimc/128x128/instances/flame.png +++ b/launcher/resources/multimc/128x128/instances/flame.png diff --git a/launcher/resources/multimc/32x32/instances/flame.png b/launcher/resources/multimc/32x32/instances/flame.png Binary files differdeleted file mode 100644 index d8987338..00000000 --- a/launcher/resources/multimc/32x32/instances/flame.png +++ /dev/null diff --git a/launcher/resources/multimc/multimc.qrc b/launcher/resources/multimc/multimc.qrc index e22fe7ee..2337acd6 100644 --- a/launcher/resources/multimc/multimc.qrc +++ b/launcher/resources/multimc/multimc.qrc @@ -6,8 +6,7 @@ <!-- REDDIT logo icon, needs reddit license! --> <file>scalable/reddit-alien.svg</file> - <!-- Icon for CurseForge. Unknown license? --> - <file alias="32x32/flame.png">32x32/instances/flame.png</file> + <!-- Icon for CurseForge. CC0 --> <file alias="128x128/flame.png">128x128/instances/flame.png</file> <!-- launcher settings page --> @@ -272,7 +271,6 @@ <file>32x32/instances/ftb_logo.png</file> <file>128x128/instances/ftb_logo.png</file> - <file>32x32/instances/flame.png</file> <file>128x128/instances/flame.png</file> <file>32x32/instances/gear.png</file> |
