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
..
game-model	Merge branch 'refs/heads/inventory-items-2'	2024-05-09 16:10:05 +02:00
parser	Merge branch 'refs/heads/inventory-items-2'	2024-05-09 16:10:05 +02:00
serializer	Parse Items	2024-05-09 16:03:52 +02:00