Code

Chanelle#4

Code

Open

ChanelleSpotswood wants to merge 156 commits intoZCW-Java91:masterZCW-Java91/Maven.FarmerFroilan:masterfrom Jubilee91:ChanelleJubilee91/Maven.FarmerFroilan:ChanelleCopy head branch name to clipboard

+2,439

Commits

Commits on Jul 28, 2023

• Added UML

  Minsoo5

  committed
  f697cb9

• Storageinterface. UML 3.1

  BrentCubbage1

  committed
  f6a76be

• updated person. UML 3.2

  BrentCubbage1

  committed
  0f01c30

• 3.5 UML

  BrentCubbage1

  committed
  19c4e2d

• UML 3.75

  BrentCubbage1

  committed
  6f5a7ff

• UML 3.9

  BrentCubbage1

  committed
  d67e77c

• Update .DS_Store

  BrentCubbage1

  committed
  b249d67

• animal test

  BrentCubbage1

  committed
  72c6ef9

• Merge pull request #1 from Jubilee91/Brent

  Show description for dffa0c2
  BrentCubbage1

  authored
  dffa0c2

• person test added

  Jhuntenburg

  committed
  0390fc8

• person test added2

  Jhuntenburg

  committed
  3320a4f

• person test added2

  Jhuntenburg

  committed
  a8885ca

• Pomm update

  Minsoo5

  committed
  f6f160b

• Merge remote-tracking branch 'origin/master'

  Show description for 3e94cd3
  Minsoo5

  committed
  3e94cd3

• froilanda tests started

  Jhuntenburg

  committed
  21a6006

• Starting chickencoop test

  BrentCubbage1

  committed
  285c278

• froilanda tests done

  Jhuntenburg

  committed
  8947aaa

• StableTest & ChickenCoopTests

  BrentCubbage1

  committed
  fefed46

• froilan tests started

  Jhuntenburg

  committed
  9705121

• FarmHouseTests

  BrentCubbage1

  committed
  fb16cbc

• Tractor Tests

  Minsoo5

  committed
  902fe14

• froilan tests continue

  Jhuntenburg

  committed
  f288eaf

• FarmHouseTest complete

  BrentCubbage1

  committed
  1ea04b2

• froilan tests

  Jhuntenburg

  committed
  1f1d1db

• CropDuster Test

  Minsoo5

  committed
  5d13a15

• FarmField tests written

  BrentCubbage1

  committed
  3df54c1

• froilan tests finished

  Jhuntenburg

  committed
  3675795

• Pantry test

  BrentCubbage1

  committed
  4a2fcbe

• collected master merge. will pull request

  BrentCubbage1

  committed
  632523d

• Merge pull request #2 from Jubilee91/Brent

  Show description for f61039c
  BrentCubbage1

  authored
  f61039c

• creating tests for edible

  surabhidas47

  committed
  5d333a8

• person tests complete for now

  Jhuntenburg

  committed
  69b09d0

• Crop Duster Class Done

  Minsoo5

  committed
  208d5a6

• Merge remote-tracking branch 'origin/master'

  Minsoo5

  committed
  13d3152

• Merge pull request #3 from Jubilee91/joeBranch

  Show description for 235956b
  Jhuntenburg

  authored
  235956b

• Merge remote-tracking branch 'origin/master'

  Minsoo5

  committed
  568f96d

• pom update

  Jhuntenburg

  committed
  26f9fd8

• earCorn Tests

  surabhidas47

  committed
  68f4b49

• kale tests

  surabhidas47

  committed
  0f1fdee

• Started Tractor

  Minsoo5

  committed
  97cb406

Commits on Jul 29, 2023

• Storage Unit Classes written

  BrentCubbage1

  committed
  d585b6a

• update merge to master

  BrentCubbage1

  committed
  b612fd2

• Merge pull request #4 from Jubilee91/Brent

  Show description for 42d5185
  BrentCubbage1

  authored
  42d5185

• crop tests

  surabhidas47

  committed
  71c74c7

• Merge branch 'surabhiBranch25' into master

  surabhidas47

  authored
  7558ffa

• Merge pull request #5 from Jubilee91/master

  Show description for a6af72f
  surabhidas47

  authored
  a6af72f

• Vehicle Interface Test Done

  Minsoo5

  committed
  2525a3f

• Vehicle Test Check Point

  Minsoo5

  committed
  f2e2fe7

• Vehicle Test Done

  Minsoo5

  committed
  b7c9a8d

• Vehicle Interface Test Done

  Minsoo5

  committed
  1fdce27

• Merge remote-tracking branch 'origin/master'

  Minsoo5

  committed
  565e40a

• pom file merge conflict resolution

  Jhuntenburg

  committed
  afdf278

• Eater and animal added

  Jhuntenburg

  committed
  189768a

• feeder interface

  Jhuntenburg

  committed
  5f724cc

• Person update

  Jhuntenburg

  committed
  7b873e9

• fertilizing anf harvesting tests

  surabhidas47

  committed
  589ad6b

• pilot interface

  Jhuntenburg

  committed
  625fbcf

• Farmer and rider

  Jhuntenburg

  committed
  b684ff9

• edible tests

  surabhidas47

  committed
  3056db0

• Vehicle Tests Checkpoint

  Minsoo5

  committed
  d3e5d00

• Merge branch 'master' into min

  Minsoo5

  committed
  91fcbaa

• Froilan added

  Jhuntenburg

  committed
  5399de5

• Added Noise Maker

  Minsoo5

  committed
  40d1924

• NoiseMaker Test

  Minsoo5

  committed
  e3c63c8

• Merge pull request #6 from Jubilee91/master

  Show description for 704e0a2
  surabhidas47

  authored
  704e0a2

• Merge pull request #7 from Jubilee91/surabhiBranch25

  Show description for 34c3820
  surabhidas47

  authored
  34c3820

• Froilan getting going

  Jhuntenburg

  committed
  b79cf2c

• Merge branch 'master' into joeBranch

  Jhuntenburg

  committed
  af50b23

• AirCraft test

  Minsoo5

  committed
  994855e

• AirCraft Interface Class

  Minsoo5

  committed
  8b9522c

• Fixed vehicle interfaces

  Minsoo5

  committed
  d1fe5bc

• Merge remote-tracking branch 'origin/master'

  Minsoo5

  committed
  a59ea07

• classes for pull request

  Jhuntenburg

  committed
  21faa7f

• Merge branch 'master' into joeBranch

  Jhuntenburg

  authored
  1f7be8c

• Merge pull request #8 from Jubilee91/joeBranch

  Show description for eab8814
  Jhuntenburg

  authored
  eab8814

• local changes

  Minsoo5

  committed
  840554f

• Froilan wrapping up

  Jhuntenburg

  committed
  ea82705

• Merge remote-tracking branch 'origin/joeBranch' into joeBranch

  Jhuntenburg

  committed
  52c087d

• Renamed Vehicle Getter

  Minsoo5

  committed
  6cc589a

• Fixed Person Conflicts in Tractor Test

  Minsoo5

  committed
  e8ae454

• person classes added

  Jhuntenburg

  committed
  bb71670

• Merge pull request #9 from Jubilee91/joeBranch

  Show description for 675c092
  Jhuntenburg

  authored
  675c092

• fixed tests and wrapping up the day

  Jhuntenburg

  committed
  de02933

• edible classes

  surabhidas47

  committed
  ff17740

Commits on Jul 30, 2023

• Animal tests added

  

  ChanelleSpotswood

  committed
  c02c5d7

• Merge branch 'master' into joeBranch

  Jhuntenburg

  committed
  e5ae3b9

• formating

  Jhuntenburg

  committed
  5f44e33

• Re-imported Person Classes

  Minsoo5

  committed
  cf762ce

• "Merge remote-tracking branch 'origin' into joeBranch"

  Jhuntenburg

  committed
  3885b69

• importing classes

  Jhuntenburg

  committed
  17b9866

• Horse test cases added

  

  ChanelleSpotswood

  committed
  4b5eee3

• added edible package

  surabhidas47

  committed
  8914017

• retry

  surabhidas47

  committed
  4eac7b3

• Merge remote-tracking branch 'origin/master'

  surabhidas47

  committed
  92d9ccf

• 'Merge branch 'joeBranch''

  Jhuntenburg

  committed
  8563b9d

• Interface Fix

  Minsoo5

  committed
  4039c34

• Merging for Edible interface

  Minsoo5

  committed
  8dd2df9

• workin on the master

  Jhuntenburg

  committed
  7b74d9f

• Merge remote-tracking branch 'origin/master'

  Show description for b92ea30
  Jhuntenburg

  committed
  b92ea30

• crop classes

  surabhidas47

  committed
  672850d

• added crop classes

  surabhidas47

  committed
  75d347b

• "Merge branch 'surabhiBranch25'"

  surabhidas47

  committed
  4fef9b4

• update

  BrentCubbage1

  committed
  f38ea47

• latest merge

  Jhuntenburg

  committed
  d28d6dc

• Update pantry

  BrentCubbage1

  committed
  f6bd023

• pushing pantry constructor

  BrentCubbage1

  committed
  ac25b46

Commits on Jul 31, 2023

• "Merge remote-tracking branch 'origin' into joeBranch"

  Jhuntenburg

  committed
  f7ac3f7

• fixing red

  Jhuntenburg

  committed
  468b10f

• Merge pull request #10 from Jubilee91/joeBranch

  Show description for 5506f96
  Jhuntenburg

  authored
  5506f96

• Pulling master

  Minsoo5

  committed
  e8addc7

• "Min and master merge

  Show description for 80d93e7
  Minsoo5

  committed
  80d93e7

• Rideable Interface Added

  Minsoo5

  committed
  018ec1a

• Rideable in Vehicle Class

  Minsoo5

  committed
  a65b6fb

• Rider Interface Fized

  Minsoo5

  committed
  baca590

• Rider Done

  Minsoo5

  committed
  dd3169b

• jul31

  surabhidas47

  committed
  ba60ce4

• some changes in tests

  surabhidas47

  committed
  a7ef0db

• fixing things

  Jhuntenburg

  committed
  060dc53

• "Merge branch 'master', remote-tracking branch 'origin' into surabhiBranch25"

  surabhidas47

  committed
  68d328c

• Merge pull request #11 from Jubilee91/joeBranch

  Show description for 75bdcee
  Jhuntenburg

  authored
  75bdcee

• Merge remote-tracking branch 'origin/master'

  surabhidas47

  committed
  16e8b95

• "Merge branch 'surabhiBranch25'"

  surabhidas47

  committed
  1cb19d9

• Tractor ReFactor

  Minsoo5

  committed
  7a32919

• Chicken and Horse classes made

  

  ChanelleSpotswood

  committed
  704e656

Commits on Aug 1, 2023

• Merge remote-tracking branch 'origin/master'

  

  ChanelleSpotswood

  authored and

  ChanelleSpotswood

  committed
  f5afb2a

• Chicken and Horse progress

  

  ChanelleSpotswood

  authored and

  ChanelleSpotswood

  committed
  519d405

• Merge pull request #12 from Jubilee91/Chanelle

  Show description for e047c66
  ChanelleSpotswood

  authored
  e047c66

Commits on Aug 2, 2023

• Test branch

  BrentCubbage1

  committed
  b11290e

• compile testing

  BrentCubbage1

  committed
  7d70cb7

• test compiling

  BrentCubbage1

  committed
  32a176a

Commits on Aug 3, 2023

• fix storageunit to extend arraylist

  BrentCubbage1

  committed
  1695540

Commits on Aug 4, 2023

• Tractor

  Minsoo5

  committed
  7ee0f72

Commits on Aug 7, 2023

• Merge pull request #13 from Jubilee91/funsies

  Show description for ca30429
  BrentCubbage1

  authored
  ca30429

• it plants

  BrentCubbage1

  committed
  fefa54d

• For The Merge

  Minsoo5

  committed
  7bc5b0a

• he eats

  BrentCubbage1

  committed
  49086e8

• something

  BrentCubbage1

  committed
  d5d9c2b

• StorageUnit children basic tests passing. Get, add, remove, isEmpty

  BrentCubbage1

  committed
  8003337

• cropduster

  Minsoo5

  committed
  2d578a9

• crop

  Minsoo5

  committed
  3ec06a8

• Merge remote-tracking branch 'origin/master'

  Minsoo5

  committed
  bd8280a

• crops

  Minsoo5

  committed
  78a3a1d

• Fixed Operate on Farm from Farm Veh

  Minsoo5

  committed
  61ec1a7

• Vehicle Tests

  Minsoo5

  committed
  f55e3bc

• check point

  Minsoo5

  committed
  e49525b

• fixed tractor

  Minsoo5

  committed
  bc9d01b

• "MErging branches

  Show description for cc57e3d
  Minsoo5

  committed
  cc57e3d

• We testing

  BrentCubbage1

  committed
  557ca99

• conflict resolved

  Minsoo5

  committed
  279dd8c

• Merge remote-tracking branch 'origin/master'

  Show description for 9800316
  Minsoo5

  committed
  9800316

• Froilanda eats

  BrentCubbage1

  committed
  98463a7

• Merge branch 'master' of https://github.com/Jubilee91/Maven.FarmerFroilan

  BrentCubbage1

  committed
  f5dd752

• She flyin

  BrentCubbage1

  committed
  9256c31

• She feedin the chickens

  BrentCubbage1

  committed
  e7c60e8

• All animal test passing

  

  ChanelleSpotswood

  authored and

  ChanelleSpotswood

  committed
  287c7e4

• All animal test passing

  

  ChanelleSpotswood

  authored and

  ChanelleSpotswood

  committed
  0544d39