Sebastian Böckelmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							72fc9dbc05
							
						
					 | 
					
						
						
							
							Merge branch 'refs/heads/inventory-items-2'
						
						
						
						
						
						
						
						# Conflicts:
#	app/main.ts
#	app/storage/ModelComponentFileDirectory.js
#	app/storage/ModelComponentFileDirectory.ts
#	app/storage/StoredGameModel.js
#	app/storage/StoredGameModel.ts
#	app/storage/loader/GameModelLoader.js
#	app/storage/loader/GameModelLoader.ts
#	app/storage/loader/ItemLoader.js
#	app/storage/loader/ItemLoader.ts
#	src/app/app.component.html
#	src/app/app.component.ts
#	src/app/app.module.ts
#	src/app/editor/editor.component.html
#	src/app/editor/editor.component.ts
#	src/app/project/game-model/GameModel.ts
#	src/app/project/game-model/ModelComponentType.ts
#	src/app/project/game-model/ModelComponentTypeUtillities.ts
#	src/app/project/game-model/inventory/Item.ts
#	src/app/project/serializer/ItemSerializer.ts 
						
					 | 
					
						2024-05-09 16:10:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Böckelmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							f01d8c4dab
							
						
					 | 
					
						
						
							
							Parse Items
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				E2E Testing / test (push) Successful in 1m33s 
				
			 
		
		
	 
 
	 
						
					 | 
					
						2024-05-09 16:03:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Böckelmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb2094aa49
							
						
					 | 
					
						
						
							
							Parse Itemgroups
						
						
						
						
						
					 | 
					
						2024-05-09 15:24:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Böckelmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							73edf03fa0
							
						
					 | 
					
						
						
							
							Load Itemgroups
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				E2E Testing / test (push) Successful in 1m37s 
				
			 
		
		
	 
 
	 
						
					 | 
					
						2024-05-09 13:33:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Böckelmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							1b2fd273bf
							
						
					 | 
					
						
						
							
							Persist Items
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				E2E Testing / test (push) Successful in 1m36s 
				
			 
		
		
	 
 
	 
						
					 | 
					
						2024-05-09 10:03:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Böckelmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							fed0ca99bf
							
						
					 | 
					
						
						
							
							Persist Itemgroups
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				E2E Testing / test (push) Successful in 1m33s 
				
			 
		
		
	 
 
	 
						
					 | 
					
						2024-05-09 09:12:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sebastian Böckelmann
							
						 
					 | 
					
						
						
						
						
							
						
						
							8085b07264
							
						
					 | 
					
						
						
							
							Load Items
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				E2E Testing / test (push) Successful in 1m32s 
				
			 
		
		
	 
 
	 
						
					 | 
					
						2024-04-20 10:55:50 +02:00 | 
					
					
						
						
							
							
							
						
					 |