Merge branch 'development'

Bentroen · Bentroen · commit 6d6d858ceab2 · 2021-09-25T05:50:59.000-03:00
diff --git a/objects/obj_presence/Create_0.gml b/objects/obj_presence/Create_0.gml
@@ -3,6 +3,5 @@
 ready = false;
 if (!np_initdiscord(DISCORD_APP_ID, true, 0) && obj_controller.presence)
 {
-	if (obj_controller.language != 1) show_error("NekoPresence initializing failed. Do you have Discord installed?", false);
-	else show_error("NekoPresence初始化失败。如不使用Discord可在首选项内关闭该功能。", false);
+	log("NekoPresence initializing failed. Do you have Discord installed?")
 }

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,5 @@`
`3`	`3`	`ready = false;`
`4`	`4`	`if (!np_initdiscord(DISCORD_APP_ID, true, 0) && obj_controller.presence)`
`5`	`5`	`{`
`6`		`- if (obj_controller.language != 1) show_error("NekoPresence initializing failed. Do you have Discord installed?", false);`
`7`		`- else show_error("NekoPresence初始化失败。如不使用Discord可在首选项内关闭该功能。", false);`
	`6`	`+ log("NekoPresence initializing failed. Do you have Discord installed?")`
`8`	`7`	`}`