From b82e79299c60a6169a9ef76f77fafa913e958299 Mon Sep 17 00:00:00 2001
From: Jeffrey C <990135+JeffreyBytes@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:18:06 -0500
Subject: [PATCH 1/7] Added 1.6 Crops

Added Broccoli, Carrots, Powdermelon, and Summer Squash crops.
---
 config.json | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/config.json b/config.json
index dd38cfb..6425a45 100644
--- a/config.json
+++ b/config.json
@@ -132,6 +132,38 @@
 				1
 			]
 		},
+		{
+			"buy": 0,
+			"id": "broccoli",
+			"index": "Broccoli",
+			"name": "Broccoli",
+			"seasons": [
+				"fall"
+			],
+			"sell": 70,
+			"regrow": 4,
+			"stages": [
+				2,
+				2,
+				2,
+				2
+			]
+		},
+		{
+			"buy": 0,
+			"id": "carrot",
+			"index": "Carrot",
+			"name": "Carrot",
+			"seasons": [
+				"spring"
+			],
+			"sell": 35,
+			"stages": [
+				1,
+				1,
+				1
+			]
+		},
 		{
 			"buy": 80,
 			"harvest": {},
@@ -475,6 +507,23 @@
 				1
 			]
 		},
+		{
+			"buy": 0,
+			"id": "Powdermelon",
+			"index": "powdermelon",
+			"name": "Powdermelon",
+			"seasons": [
+				"winter"
+			],
+			"sell": 60,
+			"stages": [
+				1,
+				1,
+				1,
+				2,
+				2
+			]
+		},
 		{
 			"buy": 100,
 			"harvest": {},
@@ -605,6 +654,24 @@
 				2
 			]
 		},
+		{
+			"buy": 0,
+			"id": "summer_squash",
+			"index": "SummerSquash",
+			"name": "Summer Squash",
+			"seasons": [
+				"summer"
+			],
+			"sell": 45,
+			"regrow": 3,
+			"stages": [
+				1,
+				1,
+				1,
+				1,
+				2
+			]
+		},
 		{
 			"buy": 125,
 			"harvest": {},

From 176aefdcf9641f3a79aeb1089cd0794c90c89288 Mon Sep 17 00:00:00 2001
From: Jeffrey C <990135+JeffreyBytes@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:29:29 -0500
Subject: [PATCH 2/7] Added 1.6 Festivals

Added Desert Festival, Trout Derby, and SquidFest events.
---
 config.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/config.json b/config.json
index 6425a45..3b2ece5 100644
--- a/config.json
+++ b/config.json
@@ -883,6 +883,18 @@
 				"day": 13,
 				"name": "Alex"
 			},
+			{
+				"day": 15,
+				"name": "Desert Festival"
+			},
+			{
+				"day": 16,
+				"name": "Desert Festival"
+			},
+			{
+				"day": 17,
+				"name": "Desert Festival"
+			},
 			{
 				"day": 17,
 				"name": "Sam"
@@ -891,6 +903,14 @@
 				"day": 19,
 				"name": "Demetrius"
 			},
+			{
+				"day": 20,
+				"name": "Trout Derby"
+			},
+			{
+				"day": 21,
+				"name": "Trout Derby"
+			},
 			{
 				"day": 22,
 				"name": "Dwarf"
@@ -971,6 +991,14 @@
 				"day": 10,
 				"name": "Sebastian"
 			},
+			{
+				"day": 12,
+				"name": "SquidFest"
+			},
+			{
+				"day": 13,
+				"name": "SquidFest"
+			},
 			{
 				"day": 14,
 				"name": "Harvey"

From a44e4d494323bd484d06dcd532ce434b62132d3c Mon Sep 17 00:00:00 2001
From: Jeffrey C <990135+JeffreyBytes@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:32:13 -0500
Subject: [PATCH 3/7] Fixed festival tags

Added the festival tag to the v1.6 festival events.
---
 config.json | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/config.json b/config.json
index 3b2ece5..189a0c1 100644
--- a/config.json
+++ b/config.json
@@ -885,15 +885,18 @@
 			},
 			{
 				"day": 15,
-				"name": "Desert Festival"
+				"name": "Desert Festival",
+				"festival": true
 			},
 			{
 				"day": 16,
-				"name": "Desert Festival"
+				"name": "Desert Festival",
+				"festival": true
 			},
 			{
 				"day": 17,
-				"name": "Desert Festival"
+				"name": "Desert Festival",
+				"festival": true
 			},
 			{
 				"day": 17,
@@ -905,11 +908,13 @@
 			},
 			{
 				"day": 20,
-				"name": "Trout Derby"
+				"name": "Trout Derby",
+				"festival": true
 			},
 			{
 				"day": 21,
-				"name": "Trout Derby"
+				"name": "Trout Derby",
+				"festival": true
 			},
 			{
 				"day": 22,
@@ -993,11 +998,13 @@
 			},
 			{
 				"day": 12,
-				"name": "SquidFest"
+				"name": "SquidFest",
+				"festival": true
 			},
 			{
 				"day": 13,
-				"name": "SquidFest"
+				"name": "SquidFest",
+				"festival": true
 			},
 			{
 				"day": 14,

From d0c2b77e28adddf755276c13b165f9dcdaeade96 Mon Sep 17 00:00:00 2001
From: Jeffrey C <990135+JeffreyBytes@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:37:53 -0500
Subject: [PATCH 4/7] Fixed missing crops tags

Added the missing harvest tag for the new crops.
---
 config.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/config.json b/config.json
index 189a0c1..942397c 100644
--- a/config.json
+++ b/config.json
@@ -147,7 +147,8 @@
 				2,
 				2,
 				2
-			]
+			],
+			"harvest": {}
 		},
 		{
 			"buy": 0,
@@ -162,7 +163,8 @@
 				1,
 				1,
 				1
-			]
+			],
+			"harvest": {}
 		},
 		{
 			"buy": 80,
@@ -522,7 +524,8 @@
 				1,
 				2,
 				2
-			]
+			],
+			"harvest": {}
 		},
 		{
 			"buy": 100,
@@ -670,7 +673,8 @@
 				1,
 				1,
 				2
-			]
+			],
+			"harvest": {}
 		},
 		{
 			"buy": 125,

From d37d3dce80d5ba769fc0e79e062d5126b2ec6696 Mon Sep 17 00:00:00 2001
From: Jeffrey C <990135+JeffreyBytes@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:49:49 -0500
Subject: [PATCH 5/7] Added 1.6 Crop Images

---
 config.json                    |   4 ++--
 images/crops/broccoli.png      | Bin 0 -> 343 bytes
 images/crops/carrot.png        | Bin 0 -> 318 bytes
 images/crops/powdermelon.png   | Bin 0 -> 364 bytes
 images/crops/summer_squash.png | Bin 0 -> 295 bytes
 5 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 images/crops/broccoli.png
 create mode 100644 images/crops/carrot.png
 create mode 100644 images/crops/powdermelon.png
 create mode 100644 images/crops/summer_squash.png

diff --git a/config.json b/config.json
index 942397c..339679a 100644
--- a/config.json
+++ b/config.json
@@ -511,8 +511,8 @@
 		},
 		{
 			"buy": 0,
-			"id": "Powdermelon",
-			"index": "powdermelon",
+			"id": "powdermelon",
+			"index": "Powdermelon",
 			"name": "Powdermelon",
 			"seasons": [
 				"winter"
diff --git a/images/crops/broccoli.png b/images/crops/broccoli.png
new file mode 100644
index 0000000000000000000000000000000000000000..9df8e5aab1c5280d70d576fe2f5ab6bc5bd69e49
GIT binary patch
literal 343
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v1o(uwX5L~l-ovE5fQd=Ykh@%j
zDUOTDQSSf$|7J^mwgA;|lmz(&1Gyl;aIbl9Bv5Rlr;B4q#jQ8f4ssn);Bi^J`tAS!
zANlM!4wms(8+^N9*<x~zIX7g>Xa7jO0-nly)%Q7S+M=?zhDDw{%cFM4vY{>X(AtjO
zQ=G0$c*VDz@z;U1Es~RkTQ_d=VGy3%$D^${QJ1$M?bA`yJ2|~m4}6LCoU?F|-~Ts<
zr5bKt_Dk;wSu)#Bhxt#(rN=8j&JnmXvmx2XN-k=99^;P9Sr?w%W6ijIb3*)I{Q_NC
iM}EdKd%t~5JPcR5^}osrK8*!Bp25@A&t;ucLK6TB2Z+`H

literal 0
HcmV?d00001

diff --git a/images/crops/carrot.png b/images/crops/carrot.png
new file mode 100644
index 0000000000000000000000000000000000000000..92056063c83e413f6e2843dccf7b5b897a5d010f
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>F1^9%xYM&JNzn;OwRz6CD`$i(e
zOb=F_a=vma#s4h~|NsC0A@gP$P$gGMkY6y63jqw9&gh&6icau!aSW-rb!N&%t_B4j
z*XLW-{Qv*3ZMs`irc>_S_P_$ZJ5yYLr@RPF)ZJ<KgR7y#WBKj|gW|V4IK4f4CZ7Mn
z)s&~Isap6dx?G^>+yZ9~BUiaMhmSX1xFr3>pG8Jvj##el1Bb1<_VCrE$a62a825}f
zSN#QR`R!=#U6W&Pd0gO^*t%V8-o-MfY*E|RlQK*^4EMR*+I5vxx`A$E@O1TaS?83{
F1OPE=dh7rI

literal 0
HcmV?d00001

diff --git a/images/crops/powdermelon.png b/images/crops/powdermelon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2765a31f3f8b6da06ac7711e68177e9a872bcc8f
GIT binary patch
literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<P2Ka=yGS%N@y0D39ZU<9h2UF_V
z!~g#?In^*7e8%+u`hPI+T*JN;sF=GX$S)Wo0wNi_{24z1g?D+nIEGZ*Ix{Vh`-lQh
z^Xg##_y7Mt;BIS`lWw-Xq029HtHvl*d-HqWo8FCQJ?Fk%;IUxqv|>NaulH^`EVbU*
z+r*&Ovar|G|L<~V#{P*ZQvY6Ejo_IQWEX7UGd;GSVTDqoNqCH^_SUdGL7opUCD#TU
zCG*JYNL*l)n51|>yG|@%mRyzSfh2<i8&lKXI2u?TIJvcrVFgpd`Teb5F4);MF&LRG
w<#$%;%A0ePv2KH0sol?O%-#P?>zH^LSh<~AB~Krj1oQ=ir>mdKI;Vst0GhFojsO4v

literal 0
HcmV?d00001

diff --git a/images/crops/summer_squash.png b/images/crops/summer_squash.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d986cdedf3e897aba504705aadc3c4fbd2bb725
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=a2Ka=yy1B8POHuzbU)xSXs=-bA
z&rR+B|Nl=FWc&kEz+MvM7YyVA0fUq`vl~#T)zif>q~g|-X?OV=6gb>Ap7>t>WZwqK
z9d-IDQTIiQpXWT9<MA``Mff2NP9+2503|M^200b(+UF70+zW!eCbN8f?X+;?Zw@AJ
zliow|38KBT*koE`SEOYh@IK&bztESNk!5pr`NG10<fTjZw&cuhTG#*kBFiiND~!R#
jwj#f|<^NfoVd7zUSE8%8?l>ze&_N8Iu6{1-oD!M<arkSJ

literal 0
HcmV?d00001


From 7773519ca934e7a09c01b884438606071808f8ae Mon Sep 17 00:00:00 2001
From: Jeffrey C <990135+JeffreyBytes@users.noreply.github.com>
Date: Mon, 25 Mar 2024 21:56:22 -0500
Subject: [PATCH 6/7] Added 1.6 Crop Seed Images

---
 images/seeds/broccoli.png      | Bin 0 -> 364 bytes
 images/seeds/carrot.png        | Bin 0 -> 353 bytes
 images/seeds/powdermelon.png   | Bin 0 -> 379 bytes
 images/seeds/summer_squash.png | Bin 0 -> 362 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 images/seeds/broccoli.png
 create mode 100644 images/seeds/carrot.png
 create mode 100644 images/seeds/powdermelon.png
 create mode 100644 images/seeds/summer_squash.png

diff --git a/images/seeds/broccoli.png b/images/seeds/broccoli.png
new file mode 100644
index 0000000000000000000000000000000000000000..bda4a34a76488c408b3ff8f8744a1a25b1076453
GIT binary patch
literal 364
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v2l#}zMz2>s(xz`)F6JI0Yp<oV
zAk`|)%DlqI?*IS)EI0gi0F`l;1o;I6xnRH$>|Y@S6g=eV;uunK>&TRge1{ZxT(y~Q
z|F7Rz+J5!WvWpVCemk7n(Jrz}>2?1k`^MDk0`aU@qP#V?``W#mQNZw8AckW_(YYmg
zVZ3%%6O9(+otAseDa^5Aw&~Sc@g?(K9d%($S)ctQ$V+LF^5sn{uUZQ{U`X5QaJ-L`
z@eKomJKF+NH<5(=X@)WDb{;owVK|dm5S;dR(M@KX`hyw`*<Tr0)0ACayD{yPUh8dp
zVP3yLL*0k3c3rW%#OCs>;j_Ma`*?-XhpBQ*JPeQQjUL4G*{uZnhQZU-&t;ucLK6Tp
Cp^aGp

literal 0
HcmV?d00001

diff --git a/images/seeds/carrot.png b/images/seeds/carrot.png
new file mode 100644
index 0000000000000000000000000000000000000000..b23d910dec70f8246ec35dfe99eada68225a6fcd
GIT binary patch
literal 353
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<v2l#}z_Viett6=!w!*HZce?h91
zy_Qa#m3f7a-T(jpmn$8t0V?Ax3GxdDa>0Nh*uO#uD7f9z#WAGf){!X>`I;4Y*bXxO
z`scr=?{L%%y=bvle+_!;(pN+r`lkHQKk=^QtKBU@US2N)H<mu%!R^xi$j$MD<>r!J
zuaBAXYTT2qT@|)1lwtM!++z~p9p3&}b;GZ#4U$?Gx%*{V_j+3$^C&5aX<5j4$=j7n
zX6LqpAB5W2rpdCrs45U#CzX&C{PZh#6{pqYS=UOnd)6&a*ch0*KvrIl>2repJL^3w
qq%WR4l(r>UkN@$>L*X{85)73q&CJ=wBb$I;VDNPHb6Mw<&;$So&56YT

literal 0
HcmV?d00001

diff --git a/images/seeds/powdermelon.png b/images/seeds/powdermelon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4980d65c3268ec8d3465a19cb78c0e050f5c7b80
GIT binary patch
literal 379
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<P2Ka=yUi|of+4WcYbB+~UJ$a-}
ze?h91y_Qb8Q+Aw{d4-SN|Ns9JpHBY?RLorx<QEL&LIH!9KjSB$@JUY>$B>F!N2Wyb
zH5>4-Zl1vUuKq#P%tvYttHVOi{C04w6ux=vSg!r4znp7!^L>nUSZlg;i^<oI2WBuw
z@E`1L(0K0iDr@S4%jGk8I-)lpuR18f^ynE+xn^s4rB|r_F)oE_%LK+FvQ8a_kL27g
z2wZ5@+1;Yp@X$)Sf$7(qz2DDSu59$0vXLcYewnbtlBrA7k{g(kCg(E+d@p8M%W#)5
zE1+%dfwQlon9|wIlimH#GJIQ@uNP%q_;|yj$&G6d>wW!}ZX@}_i=UB=;qXGI;zj!Z
R!+@S*@O1TaS?83{1OOHXos$3n

literal 0
HcmV?d00001

diff --git a/images/seeds/summer_squash.png b/images/seeds/summer_squash.png
new file mode 100644
index 0000000000000000000000000000000000000000..739ec662e46e2e0eab69f2af05658ac386323b14
GIT binary patch
literal 362
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEa{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>F1^9%x_VietOHuzbU;EEZ?IUga
z_F6g%Qmx{w%qx8C{{R0UySs4%P$gGMkY6y63jqw9&gh&6ith1raSW-rb!5szzC#K;
zE!-SA@BbeP>%ZD`CWB}D?~PLm<ui{*-K?MThcl<W?T6NaYf)Z1ZJ$2wTgbeD?_g_#
z*7Ke#XIC9uULC=+;`XNY(nA7_rOEtx9NueR9o@i?vj1ySw9A1lztxy_9g8kLE)neY
zi{*j@*N3=<owgUGnpq<lcZoZF$jj+94QNm-<;XiLci^#j3gflO={Ij{Br?U_%VOQ~
z(UI{2|F^>Bha6+O_1MbVeM_x+#F^t?>K$M>Vq*8>He0DR&>sw*u6{1-oD!M<QtOqv

literal 0
HcmV?d00001


From a29c92670155b204c848978d536e0846122d2680 Mon Sep 17 00:00:00 2001
From: Jeffrey C <990135+JeffreyBytes@users.noreply.github.com>
Date: Wed, 9 Apr 2025 18:08:24 -0500
Subject: [PATCH 7/7] fixed incorrect dates for Desert Festival

---
 config.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/config.json b/config.json
index 339679a..a2c6fdc 100644
--- a/config.json
+++ b/config.json
@@ -843,6 +843,21 @@
 				"day": 14,
 				"name": "Haley"
 			},
+			{
+				"day": 15,
+				"name": "Desert Festival",
+				"festival": true
+			},
+			{
+				"day": 16,
+				"name": "Desert Festival",
+				"festival": true
+			},
+			{
+				"day": 17,
+				"name": "Desert Festival",
+				"festival": true
+			},
 			{
 				"day": 18,
 				"name": "Pam"
@@ -887,21 +902,6 @@
 				"day": 13,
 				"name": "Alex"
 			},
-			{
-				"day": 15,
-				"name": "Desert Festival",
-				"festival": true
-			},
-			{
-				"day": 16,
-				"name": "Desert Festival",
-				"festival": true
-			},
-			{
-				"day": 17,
-				"name": "Desert Festival",
-				"festival": true
-			},
 			{
 				"day": 17,
 				"name": "Sam"