From c184d8b7a7a68afa5f413935fe099cf6ef5385d9 Mon Sep 17 00:00:00 2001
From: Zohnannor <35764628+Zohnannor@users.noreply.github.com>
Date: Mon, 25 Jan 2021 19:02:24 +0300
Subject: [PATCH 1/2] Update CM.Disp.FormatTime

Add years to date formatting, fixes #502
---
 CookieMonster.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CookieMonster.js b/CookieMonster.js
index 6e51177..af2fab4 100644
--- a/CookieMonster.js
+++ b/CookieMonster.js
@@ -1326,6 +1326,7 @@ CM.Disp.FormatTime = function(time, longFormat) {
 		str += (s < 10 ? '0' : '') + s + ':';
 	} else {
 		if (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
+		str += (y > 0 ? y + (longFormat ? (y == 1 ? ' year' : ' years') : 'y') + ', ': "");
 		str += (d > 0 ? d + (longFormat ? (d == 1 ? ' day' : ' days') : 'd') + ', ': "");
 		if (str.length > 0 || h > 0) str += h + (longFormat ? (h == 1 ? ' hour' : ' hours') : 'h') + ', ';
 		if (str.length > 0 || m > 0) str += m + (longFormat ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', ';

From 192c5d105cb3284cb267d6c2ead2a529e66f8528 Mon Sep 17 00:00:00 2001
From: Zohnannor <herovblin@gmail.com>
Date: Mon, 25 Jan 2021 22:20:59 +0300
Subject: [PATCH 2/2] Fix in Disp.js and combine

---
 src/Disp.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Disp.js b/src/Disp.js
index e15985f..50df6c8 100644
--- a/src/Disp.js
+++ b/src/Disp.js
@@ -147,6 +147,7 @@ CM.Disp.FormatTime = function(time, longFormat) {
 		str += (s < 10 ? '0' : '') + s + ':';
 	} else {
 		if (time > 777600000) return longFormat ? 'Over 9000 days!' : '>9000d';
+		str += (y > 0 ? y + (longFormat ? (y == 1 ? ' year' : ' years') : 'y') + ', ': "");
 		str += (d > 0 ? d + (longFormat ? (d == 1 ? ' day' : ' days') : 'd') + ', ': "");
 		if (str.length > 0 || h > 0) str += h + (longFormat ? (h == 1 ? ' hour' : ' hours') : 'h') + ', ';
 		if (str.length > 0 || m > 0) str += m + (longFormat ? (m == 1 ? ' minute' : ' minutes') : 'm') + ', ';