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

2020-05-16 23:51:32 +09:00 · 2020-05-16 23:51:32 +09:00 · c1b95838f6
commit c1b95838f6
parent 6cee608c91 d979fb6dc0
4 changed files with 4 additions and 0 deletions
--- 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",
 	}
 ]