saved - #62

Open

Dariuss13 wants to merge 44 commits into

ZipCodeCore:masterfrom

Luciaw1219:Sprye

Commits on May 16, 2023

add eater, animal, horse, stable (edible params commented out)
Luciaw1219
committed
99b9140
add junit to pom.xml and specify java version 19
Luciaw1219
committed
4a455ff
add rideable to horse commented out until rideable is created
Luciaw1219
committed
a50dbe1

Commits on May 17, 2023

Mohammed amine is cool

Mohammed amine ztait
authored and
Mohammed amine ztait
committed
cb88a1e
classes done
mouad1937
committed
0ed25cf
done
mouad1937
committed
aa24738

Commits on May 18, 2023

Mohammed amine is cool

Mohammed amine ztait
authored and
Mohammed amine ztait
committed
2a02478

Commits on May 19, 2023

saved
Dariuss13
committed
7f47c88
Merge pull request #1 from Luciaw1219/lucia2
Luciaw1219
authored
9f74799
Merge pull request #2 from Luciaw1219/Lucia
Luciaw1219
authored
54a016b
Merge branch 'master' of github.com:Luciaw1219/FarmerFroilan into AmineWork

Mohammed amine ztait
authored and
Mohammed amine ztait
committed
c971c01
Merge branch 'master' of github.com:Luciaw1219/FarmerFroilan into Sprye
Dariuss13
committed
9edbd5e
Merge pull request #5 from Luciaw1219/Sprye
Luciaw1219
authored
e24dbbf
Merge branch 'master' of github.com:Luciaw1219/FarmerFroilan into AmineWork

Mohammed amine ztait
authored and
Mohammed amine ztait
committed
2ab38c2
Merge pull request #4 from Luciaw1219/AmineWork
Luciaw1219
authored
b39f409

Commits on May 20, 2023

organize files, resolve dependencies
Luciaw1219
committed
8057a3b
Merge pull request #7 from Luciaw1219/Lucia
Luciaw1219
authored
89fef60
save
Dariuss13
committed
18a3c79
Merge pull request #8 from Luciaw1219/Ahlafi
Dariuss13
authored
258a153

Commits on May 21, 2023

remove ds store, move vehicles into vehicles pacage, add test classes for every object, implement rideable on horse
Luciaw1219
committed
dcde73b
Merge pull request #9 from Luciaw1219/Lucia
Dariuss13
authored
a18098b
new save
Dariuss13
committed
ea6df1b
save1
Dariuss13
committed
0d07652
Merge branch 'master' of https://github.com/Luciaw1219/FarmerFroilan into Ahlafi
mouad1937
committed
0fd42d0
Merge pull request #12 from Luciaw1219/Ahlafi
Luciaw1219
authored
4ed7b33
saved2
Dariuss13
committed
fb409fe
Merge pull request #10 from Luciaw1219/Sprye
Luciaw1219
authored
56df4da
add import of crop to croprow, fix stable array, remove yeild method from crop as it should be implemented by subclasses
Luciaw1219
committed
52cab5b
Merge pull request #13 from Luciaw1219/Lucia
Luciaw1219
authored
a784acf
create plants and food packages
Luciaw1219
committed
de18390
correct mistake for harvesting and yeilding
Luciaw1219
committed
69f1e85
uncomment croprow for farmer
Luciaw1219
committed
cfcc2a8
uncomment croprow for farmer
Luciaw1219
committed
238eae5
Merge pull request #14 from Luciaw1219/Lucia
Luciaw1219
authored
ed956b3
save3
Dariuss13
committed
27eaffe
save4
Dariuss13
committed
9c80735
1
Dariuss13
committed
b4dc8dd
finish
mouad1937
committed
0067033

Commits on May 22, 2023

classes done
mouad1937
committed
282dc2e
Merge branch 'master' into Ahlafi
Luciaw1219
authored
247de4d
Merge pull request #16 from Luciaw1219/Ahlafi
Luciaw1219
authored
a31d189
resolve merge conflicts
Luciaw1219
committed
8e64d32
Merge pull request #17 from Luciaw1219/Lucia
Luciaw1219
authored
accf6c3
2
Dariuss13
committed
4ba2b3e