aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2021-12-05 23:26:04 +0100
committerPetr Mrázek <peterix@gmail.com>2021-12-05 23:26:04 +0100
commit70d400f205952912cbfa0a13cd8c84687ef06baa (patch)
treeefcba7a841e8038699eb5baa7811a27a4b101ebc
parentcd513c02c46f0aaebe51b0d5ed8ad01f077dee4f (diff)
downloadPrismLauncher-70d400f205952912cbfa0a13cd8c84687ef06baa.tar.gz
PrismLauncher-70d400f205952912cbfa0a13cd8c84687ef06baa.tar.bz2
PrismLauncher-70d400f205952912cbfa0a13cd8c84687ef06baa.zip
NOISSUE party hat for a party cat
On the 30th of November, it's been 10 years since the first (documented) release of MultiMC. Party hats for everyone :)
-rw-r--r--changelog.md2
-rw-r--r--launcher/resources/backgrounds/backgrounds.qrc1
-rw-r--r--launcher/resources/backgrounds/cattiversary.pngbin0 -> 99736 bytes
-rw-r--r--launcher/resources/sources/burfcat_hat.pngbin0 -> 15813 bytes
-rw-r--r--launcher/ui/MainWindow.cpp12
5 files changed, 14 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md
index 8cdcdf9d..7b1d4ae8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,8 @@
This further refines Microsoft account support, along with small fixes related to modpack platforms and Java runtime detection.
+It's also been 10 years since the first release of MultiMC. All background cats are now ready to party!
+
### Microsoft accounts
The account system now refreshes accounts in the background while the application is running.
diff --git a/launcher/resources/backgrounds/backgrounds.qrc b/launcher/resources/backgrounds/backgrounds.qrc
index 83505635..52921512 100644
--- a/launcher/resources/backgrounds/backgrounds.qrc
+++ b/launcher/resources/backgrounds/backgrounds.qrc
@@ -3,5 +3,6 @@
<qresource prefix="/backgrounds">
<file alias="kitteh">catbgrnd2.png</file>
<file alias="catmas">catmas.png</file>
+ <file alias="cattiversary">cattiversary.png</file>
</qresource>
</RCC>
diff --git a/launcher/resources/backgrounds/cattiversary.png b/launcher/resources/backgrounds/cattiversary.png
new file mode 100644
index 00000000..09a36566
--- /dev/null
+++ b/launcher/resources/backgrounds/cattiversary.png
Binary files differ
diff --git a/launcher/resources/sources/burfcat_hat.png b/launcher/resources/sources/burfcat_hat.png
new file mode 100644
index 00000000..a378c1fb
--- /dev/null
+++ b/launcher/resources/sources/burfcat_hat.png
Binary files differ
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 95d9ae5d..ac539fdc 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1322,8 +1322,18 @@ void MainWindow::setCatBackground(bool enabled)
if (enabled)
{
QDateTime now = QDateTime::currentDateTime();
+ QDateTime birthday(QDate(now.date().year(), 11, 30), QTime(0, 0));
QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
- QString cat = (non_stupid_abs(now.daysTo(xmas)) <= 4) ? "catmas" : "kitteh";
+ QString cat;
+ if(non_stupid_abs(now.daysTo(xmas)) <= 4) {
+ cat = "catmas";
+ }
+ else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
+ cat = "cattiversary";
+ }
+ else {
+ cat = "kitteh";
+ }
view->setStyleSheet(QString(R"(
InstanceView
{