Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
Zekiu committed Jan 12, 2025
1 parent 219b627 commit 442f112
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 40 deletions.
33 changes: 0 additions & 33 deletions launcher/resources/backgrounds/backgrounds.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,38 +16,5 @@
<file alias="wino-xmas">wino.png</file>
<file alias="wino-bday">wino.png</file>
<file alias="wino-spooky">wino.png</file>
<!-- pozostale -->
<file alias="kitteh">kitteh.png</file>
<file alias="kitteh-xmas">kitteh-xmas.png</file>
<file alias="kitteh-bday">kitteh-bday.png</file>
<file alias="kitteh-spooky">kitteh-spooky.png</file>
<file alias="rory">rory.png</file>
<file alias="rory-xmas">rory-xmas.png</file>
<file alias="rory-bday">rory-bday.png</file>
<file alias="rory-spooky">rory-spooky.png</file>
<file alias="rory-flat">rory-flat.png</file>
<file alias="rory-flat-xmas">rory-flat-xmas.png</file>
<file alias="rory-flat-bday">rory-flat-bday.png</file>
<file alias="rory-flat-spooky">rory-flat-spooky.png</file>
<!-- teawie images -->
<!-- copyright (c) SympathyTea 2023 -->
<!-- these are licensed under the CC BY-SA 4.0 and have been unmodified aside from downscaling -->
<!-- the full license with appropriate notices is avalible at https://creativecommons.org/licenses/by-sa/4.0/ -->
<file alias="teawie">teawie.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie.png -->
<file alias="teawie-xmas">teawie-xmas.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie_Holiday.png -->
<file alias="teawie-bday">teawie-bday.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie_Party.png -->
<file alias="teawie-spooky">teawie-spooky.png</file>
<!-- https://commons.wikimedia.org/wiki/File:Teawie_Halloween.png -->
<file alias="polly">polly.png</file>
<file alias="polly-xmas">polly-xmas.png</file>
<file alias="polly-bday">polly-bday.png</file>
<file alias="polly-spooky">polly.png</file>
<file alias="spaceship-phoebe">spaceship-phoebe.png</file>
<file alias="spaceship-phoebe-xmas">spaceship-phoebe-xmas.png</file>
<file alias="spaceship-phoebe-bday">spaceship-phoebe-bday.png</file>
<file alias="spaceship-phoebe-spooky">spaceship-phoebe-spooky.png</file>
</qresource>
</RCC>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed launcher/resources/backgrounds/spaceship-phoebe.png
Binary file not shown.
8 changes: 1 addition & 7 deletions launcher/ui/themes/ThemeManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -295,13 +295,7 @@ void ThemeManager::initializeCatPacks()
{
QList<std::pair<QString, QString>> defaultCats{ { "wlod", QObject::tr("Włodzimierz the Cat (kot selnov)") },
{ "piwo", QObject::tr("Piwo Piwo Piwo Piwo") },
{ "wino", QObject::tr("Wino kot") },
{ "kitteh", QObject::tr("Background Cat (from MultiMC)") },
{ "rory", QObject::tr("Rory ID 11 (drawn by Ashtaka)") },
{ "rory-flat", QObject::tr("Rory ID 11 (flat edition, drawn by Ashtaka)") },
{ "teawie", QObject::tr("Teawie (drawn by SympathyTea)") },
{ "polly", QObject::tr("Polly the Parrot (drawn by anoraktrend)") },
{ "spaceship-phoebe", QObject::tr("Spaceship and Phoebe (drawn by Evan)") } };
{ "wino", QObject::tr("Wino kot") } };
for (auto [id, name] : defaultCats) {
addCatPack(std::unique_ptr<CatPack>(new BasicCatPack(id, name)));
}
Expand Down

0 comments on commit 442f112

Please sign in to comment.