Merge branch 'develop' of https://github.com/syuilo/misskey into develop

c1b95838 · syuilo · 6cee608c · d979fb6d · c1b95838 · c1b95838
Commit c1b95838 authored 4 years ago by syuilo
--- a/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.blend
--- a/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
+++ b/src/client/assets/room/furnitures/doll-ai/doll-ai.glb
--- a/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
+++ b/src/client/assets/room/furnitures/doll-ai/doll_ai_tex.png
--- a/src/client/scripts/room/furnitures.json5
+++ b/src/client/scripts/room/furnitures.json5
@@ -395,5 +395,9 @@
 	{
 		id: 'energy-drink',
 		place: "floor",
+	},
+	{
+		id: 'doll-ai',
+		place: "floor",
 	}
 ]