Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								8f12b40e50
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/main' into main
							
							
							
							
							
							
							
							# Conflicts:
#	.gitignore
#	.idea/.gitignore
#	src/ch/zhaw/catan/Road.java
#	src/ch/zhaw/catan/SiedlerGame.java 
							
						 | 
						
							2021-12-04 12:59:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Leonardo Brandenberger
							
						 | 
						
							
							
							
							
							
								
							
							
								9e347e8792
								
							
						 | 
						
							
							
								
								implementing part of Parser class
							
							
							
							
							
						 | 
						
							2021-12-01 23:24:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								0db6be32b6
								
							
						 | 
						
							
							
								
								Road.java and changes SiedlerGame buildRoad Method
							
							
							
							
							
						 | 
						
							2021-11-26 10:05:02 +01:00 | 
						
					
				
					
						
							
							
								 
								Andrin Fassbind
							
						 | 
						
							
							
							
							
							
								
							
							
								79cc4f3f3c
								
							
						 | 
						
							
							
								
								New Class Road
							
							
							
							
							
							
							
							Start to edit SiedlerGame.buildRoad 
							
						 | 
						
							2021-11-25 17:26:18 +01:00 |