Greg#42

Open

gregdon13 wants to merge 114 commits intoZipCodeCore:masterfrom

Commits on Mar 24, 2021

UML

Greg Donnelly
authored and
Greg Donnelly
committed
UML

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #1 from gregdon13/Greg
gregdon13
authored
UML updated

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #2 from gregdon13/Greg
gregdon13
authored
uml update

Greg Donnelly
authored and
Greg Donnelly
committed
UML APPROVED

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #3 from gregdon13/Greg
gregdon13
authored
packages made

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #4 from gregdon13/Greg
gregdon13
authored
classes and interfaces made with extensions and implementations for Edible Package

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #5 from gregdon13/Greg
gregdon13
authored

Commits on Mar 25, 2021

vehicle package and edible package made

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #6 from gregdon13/Greg
gregdon13
authored
outer interfaces made

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #7 from gregdon13/Greg
gregdon13
authored
Produce interface

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #8 from gregdon13/Greg
gregdon13
authored
Crops package made

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #9 from gregdon13/Greg
gregdon13
authored
farm package made

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #10 from gregdon13/Greg
gregdon13
authored
added vehicle and edibles methods
jorget93
committed
Merge branch 'master' of https://github.com/gregdon13/Maven.FarmerFroilan into Jorge
jorget93
committed
added methods to noiseMaker Produce and Eater
jorget93
committed
routine package made

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #11 from gregdon13/Greg
gregdon13
authored
Merge pull request #12 from gregdon13/Jorge
gregdon13
authored
added 2 mothods to crop
jorget93
committed
Persons & Animal package
KellyPorter02
committed
Merge pull request #13 from gregdon13/kelly
gregdon13
authored
Added method to ProduceStand
jorget93
committed
routines package made

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #14 from gregdon13/Greg
gregdon13
authored
;aksdj

Greg Donnelly
authored and
Greg Donnelly
committed
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into Greg

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #15 from gregdon13/Jorge
gregdon13
authored
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into Greg

Greg Donnelly
authored and
Greg Donnelly
committed
made tests for EdiblesPAckage
jorget93
committed
made tests for EdiblesPAckage
jorget93
committed
Merge branch 'master' of https://github.com/gregdon13/Maven.FarmerFroilan into Jorge
jorget93
committed
Some chicken tests
KellyPorter02
committed
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into kelly
KellyPorter02
committed
changed return types of all downstream classes to Eater interface
KellyPorter02
committed
made tests for VehiclesPackage
jorget93
committed
Some tests for Horse
KellyPorter02
committed
Merge pull request #16 from gregdon13/Jorge
gregdon13
authored
coops and stables are present

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #17 from gregdon13/Greg
gregdon13
authored
Merge pull request #18 from gregdon13/kelly
gregdon13
authored
PilotTest class created
KellyPorter02
committed
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into kelly
KellyPorter02
committed
adjustments

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #19 from gregdon13/Greg
gregdon13
authored
Added method stubs to Botanist, Rider Interface
KellyPorter02
committed
lots of stuf

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #20 from gregdon13/Greg
gregdon13
authored
Tests for farmer class
KellyPorter02
committed
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into kelly
KellyPorter02
committed
harvesting crops methods added. tests added

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #21 from gregdon13/Greg
gregdon13
authored
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into kelly
KellyPorter02
committed
adding to aircraft
jorget93
committed
added to cropduster
jorget93
committed
stuff
jorget93
committed
added isMounted method to Rideable interface
KellyPorter02
committed
more stuff
jorget93
committed
Merge pull request #22 from gregdon13/Jorge
gregdon13
authored
fixed merge conflicts
KellyPorter02
committed
more tests

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #23 from gregdon13/Greg
gregdon13
authored
Merge branch 'master' into kelly
gregdon13
authored
Merge pull request #24 from gregdon13/kelly
gregdon13
authored

Commits on Mar 26, 2021

stuff

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #25 from gregdon13/Greg
gregdon13
authored
added moonshine methods and tests
jorget93
committed
tests for CropRow

Greg Donnelly
authored and
Greg Donnelly
committed
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into Greg

Greg Donnelly
authored and
Greg Donnelly
committed
still some red but builds and runs
jorget93
committed
Merge pull request #26 from gregdon13/Jorge
gregdon13
authored
croptests

Greg Donnelly
authored and
Greg Donnelly
committed
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into Greg

Greg Donnelly
authored and
Greg Donnelly
committed
more tests added to fields and rows

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #27 from gregdon13/Greg
gregdon13
authored
produceStand and tests

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #28 from gregdon13/Greg
gregdon13
authored
worked on stuff
jorget93
committed
Merge branch 'master' of https://github.com/gregdon13/Maven.FarmerFroilan
jorget93
committed
Merge pull request #30 from gregdon13/Jorge
gregdon13
authored
added crop methods
jorget93
committed
Merge pull request #31 from gregdon13/Jorge
gregdon13
authored
routines

Greg Donnelly
authored and
Greg Donnelly
committed
Merge branch 'master' into Greg
gregdon13
authored
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into Greg

Greg Donnelly
authored and
Greg Donnelly
committed
should merge now

Greg Donnelly
authored and
Greg Donnelly
committed
Merge branch 'Greg' of github.com:gregdon13/Maven.FarmerFroilan into Greg

Greg Donnelly
authored and
Greg Donnelly
committed
produce stopped being a bicht

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #33 from gregdon13/Greg
gregdon13
authored
crops now yield the edible plants

Greg Donnelly
authored and
Greg Donnelly
committed
can't get harvestRow to work because Field is somehow null

Greg Donnelly
authored and
Greg Donnelly
committed
upaate`

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #34 from gregdon13/Greg
gregdon13
authored
eaters can eat a number of a food. Farmer can feed chickens and horses. routine engine updates

Greg Donnelly
authored and
Greg Donnelly
committed
Merge pull request #35 from gregdon13/Greg
gregdon13
authored
added to field and tractor
jorget93
committed
Merge branch 'master' of https://github.com/gregdon13/Maven.FarmerFroilan into Jorge
jorget93
committed
Merge pull request #37 from gregdon13/Jorge
gregdon13
authored
updates

Greg Donnelly
authored and
Greg Donnelly
committed
Merge branch 'master' of github.com:gregdon13/Maven.FarmerFroilan into Greg

Greg Donnelly
authored and
Greg Donnelly
committed
got farmer.plant to work with the singleton. Struggling to get tractor to work

Greg Donnelly
authored and
Greg Donnelly
committed
ProduceStand is a singleton. MainApplication class built

Greg Donnelly
authored and
Greg Donnelly
committed

Commits on Mar 27, 2021

Tractor being tested correctly. Just need to fix isMounted for horses

Greg Donnelly
authored and
Greg Donnelly
committed
only horse mounted needs to be adjusted. Field is fixed. Tractor is fixed.

Greg Donnelly
authored and
Greg Donnelly
committed

Commits on Mar 28, 2021

produceStand prints not the hashcode

Greg Donnelly
authored and
Greg Donnelly
committed