Merge remote-tracking branch 'upstream/master' into mdl-export

This commit is contained in:
ackwell 2024-01-01 14:36:00 +11:00
commit f71d922198
87 changed files with 904 additions and 890 deletions

View file

@ -96,7 +96,10 @@
}
},
"ottergui": {
"type": "Project"
"type": "Project",
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[7.0.0, )"
}
},
"penumbra.api": {
"type": "Project"
@ -104,7 +107,8 @@
"penumbra.gamedata": {
"type": "Project",
"dependencies": {
"Penumbra.Api": "[1.0.8, )",
"OtterGui": "[1.0.0, )",
"Penumbra.Api": "[1.0.13, )",
"Penumbra.String": "[1.0.4, )"
}
},