Merge branch 'main' into 'feature/Beeber'
# Conflicts: # Microwave.ConsoleApp/Program.cs
Showing
- Microwave.Classes.Test/CookControllerTest.cs 7 additions, 7 deletionsMicrowave.Classes.Test/CookControllerTest.cs
- Microwave.Classes.Test/PowerTubeTest.cs 19 additions, 16 deletionsMicrowave.Classes.Test/PowerTubeTest.cs
- Microwave.Classes.Test/TimerTest.cs 49 additions, 2 deletionsMicrowave.Classes.Test/TimerTest.cs
- Microwave.Classes.Test/UserInterfaceTest.cs 165 additions, 117 deletionsMicrowave.Classes.Test/UserInterfaceTest.cs
- Microwave.Classes/Boundary/PowerTube.cs 14 additions, 7 deletionsMicrowave.Classes/Boundary/PowerTube.cs
- Microwave.Classes/Boundary/Timer.cs 26 additions, 0 deletionsMicrowave.Classes/Boundary/Timer.cs
- Microwave.Classes/Controllers/CookController.cs 2 additions, 2 deletionsMicrowave.Classes/Controllers/CookController.cs
- Microwave.Classes/Controllers/UserInterface.cs 46 additions, 30 deletionsMicrowave.Classes/Controllers/UserInterface.cs
- Microwave.Classes/Interfaces/ICookController.cs 1 addition, 1 deletionMicrowave.Classes/Interfaces/ICookController.cs
- Microwave.Classes/Interfaces/IPowerTube.cs 1 addition, 1 deletionMicrowave.Classes/Interfaces/IPowerTube.cs
- Microwave.Classes/Interfaces/IUserInterface.cs 4 additions, 1 deletionMicrowave.Classes/Interfaces/IUserInterface.cs
- Microwave.ConsoleApp/Program.cs 34 additions, 7 deletionsMicrowave.ConsoleApp/Program.cs
- README.md 16 additions, 86 deletionsREADME.md
Loading
Please register or sign in to comment