diff --git a/README.md b/README.md
index 9921b43db62f4ced0c9f44573ec6d040effdd551..db6c8d30369e8368134331f117b069bae0b9b702 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
 # lua-language-server
 
-![build](https://github.com/LuaLS/lua-language-server/workflows/build/badge.png)
+[![build](https://github.com/LuaLS/lua-language-server/actions/workflows/build.yml/badge.png?branch=master)](https://github.com/LuaLS/lua-language-server/actions/workflows/build.yml)
 [![version](https://vsmarketplacebadges.dev/version-short/sumneko.lua.png)](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
 ![installs](https://vsmarketplacebadges.dev/installs-short/sumneko.lua.png)
 ![downloads](https://vsmarketplacebadges.dev/downloads-short/sumneko.lua.png)
-[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/LuaLS/lua-language-server.png)](https://github.com/LuaLS/lua-language-server/issues "Average time to resolve an issue")
 
 
 ***Lua development just got a whole lot better*** 🧠
@@ -33,25 +32,25 @@ The Lua language server provides various language features for Lua to make devel
 The language server can easily be installed for use in VS Code, but it can also be used by other clients using the command line.
 
 ### Visual Studio Code
-[![Install in VS Code](https://img.shields.io/badge/Install%20For-VS%20Code-blue?style=for-the-badge&logo=visualstudiocode "Install in VS Code")](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
+[![Install in VS Code](https://img.shields.io/badge/VS%20Code-Install-blue?style=for-the-badge&logo=visualstudiocode "Install in VS Code")](https://marketplace.visualstudio.com/items?itemName=sumneko.lua)
 
 The language server and Visual Studio Code client can be installed from [the VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=sumneko.lua).
 
 ![](https://github.com/LuaLS/vscode-lua/raw/master/images//Install%20In%20VSCode.gif)
 
 ### Command Line
-[![Install for command line](https://img.shields.io/badge/Install%20For-Command%20Line-blue?style=for-the-badge&logo=windowsterminal "Install for command line")](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line)
+[![Install for command line](https://img.shields.io/badge/Command%20Line-Install-blue?style=for-the-badge&logo=windowsterminal "Install for command line")](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line)
 
-Check the [wiki for a guide](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line) to install the language server for use on the command line. This allows the language server to be used for NeoVim and other clients that follow the language server protocol.
+Check the [wiki for a guide](https://github.com/LuaLS/lua-language-server/wiki/Getting-Started#command-line) to install the language server for use on the command line. This allows the language server to be used with NeoVim and [other clients](https://microsoft.github.io/language-server-protocol/implementors/tools/) that follow the [language server protocol](https://microsoft.github.io/language-server-protocol/overviews/lsp/overview/).
 
 ## Supported Lua Versions
-| Version |    Supported   |
+| Version |   Supported    |
 | :-----: | :------------: |
-| Lua 5.1 | ![][checkmark] |
-| Lua 5.2 | ![][checkmark] |
-| Lua 5.3 | ![][checkmark] |
-| Lua 5.4 | ![][checkmark] |
-| LuaJIT  | ![][checkmark] |
+| Lua 5.1 | ![✅][checkmark] |
+| Lua 5.2 | ![✅][checkmark] |
+| Lua 5.3 | ![✅][checkmark] |
+| Lua 5.4 | ![✅][checkmark] |
+| LuaJIT  | ![✅][checkmark] |
 
 ## Links
 - [Changelog](https://github.com/LuaLS/lua-language-server/blob/master/changelog.md)
@@ -76,14 +75,13 @@ Check the [wiki for a guide](https://github.com/LuaLS/lua-language-server/wiki/G
 - `pt-br` 🇧🇷
 
 
-> ℹ Note: All translations are provided and collaborated on by the community. If you find an inappropriate or harmful translation, [please report it immediately](https://github.com/LuaLS/lua-language-server/issues).
+> **Note**
+> All translations are provided and collaborated on by the community. If you find an inappropriate or harmful translation, [please report it immediately](https://github.com/LuaLS/lua-language-server/issues).
 
 Are you able to [provide a translation](https://github.com/LuaLS/lua-language-server/wiki/Translations)? It would be greatly appreciated!
 
 Thank you to [all contributors of translations](https://github.com/LuaLS/lua-language-server/commits/master/locale)!
 
-[en-US]: https://github.com/LuaLS/lua-language-server/tree/master/locale/en-us
-
 ## Configuration
 Configuration of the server can be done in a number of ways, which are explained more in-depth in the [wiki](https://github.com/LuaLS/lua-language-server/wiki/Configuration-File).
 
@@ -95,7 +93,7 @@ See the [configuration file wiki page](https://github.com/LuaLS/lua-language-ser
 
 
 ## Privacy
-This language server has **opt-in** telemetry that collects usage data and sends it to the development team to help improve the extension. Read our [privacy policy](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy) to learn more.
+The language server had **opt-in** telemetry that collected usage data and sent it to the development team to help improve the extension. Read our [privacy policy](https://github.com/LuaLS/lua-language-server/wiki/Home#privacy) to learn more. Telemetry was removed in `v3.6.5` and is no longer part of the language server.
 
 
 ## Contributors
diff --git a/changelog.md b/changelog.md
index 62d9c36666a9dd9c8a70a5968c1a81e549f6150e..d6fb4a4fee8665f0c65b619682c648fcaa7ad195 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # changelog
 
+## 3.6.12
+`2023-3-2`
+* `NEW` [Addon Manager](https://github.com/LuaLS/lua-language-server/discussions/1607), try it with command `lua.addon_manager.open`. Thanks to [carsakiller](https://github.com/carsakiller)!
+
 ## 3.6.11
 `2023-2-13`
 * `CHG` completion: don't show loading process
diff --git a/package-lock.json b/package-lock.json
index afe873c72251d845fb9d07c541b4ac9651505398..c3b1752d67de253a219508a7dc0ae8bbeacc7d3a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "lua",
-	"version": "3.6.11",
+	"version": "3.6.12",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "lua",
-			"version": "3.6.11",
+			"version": "3.6.12",
 			"license": "MIT",
 			"engines": {
 				"vscode": "^1.67.0"
diff --git a/package.json b/package.json
index ccd2267b09702d62d97390554dd5649a6be48106..b9ac3b92a52ca50c03ac799ea93ddddf1a7315f1 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
 			},
 			{
 				"command": "lua.addon_manager.open",
-				"title": "Lua: Open Addon Manager"
+				"title": "%command.addon_manager.open%"
 			},
 			{
 				"command": "lua.exportDocument",
@@ -37,8 +37,8 @@
 		],
 		"configuration": {
 			"properties": {
-				"Lua.addonManager.enable" : {
-					"default": true,
+				"Lua.addonManager.enable": {
+					"default": false,
 					"markdownDescription": "%config.addonManager.enable%",
 					"scope": "resource",
 					"type": "boolean"
@@ -2918,6 +2918,11 @@
 					"command": "lua.exportDocument",
 					"group": "z_commands",
 					"when": "resourceLangId == lua"
+				},
+				{
+					"command": "lua.addon_manager.open",
+					"group": "z_commands",
+					"when": "resourceLangId == lua"
 				}
 			]
 		},
@@ -3065,5 +3070,5 @@
 	"sponsor": {
 		"url": "https://github.com/LuaLS/lua-language-server/issues/484"
 	},
-	"version": "3.6.11"
+	"version": "3.6.12"
 }
diff --git a/package.nls.json b/package.nls.json
index 6e664354e3f15520d880988247e297d61db577bf..98e060db085091f210eb82bf64e55244cb32f211 100644
--- a/package.nls.json
+++ b/package.nls.json
@@ -1,10 +1,11 @@
 {
-    "command.exportDocument": "Export Document ...",
-    "config.addonManager.enable": "Set the on/off state for the addon manager.",
+    "command.addon_manager.open": "Lua: Open Addon Manager ...",
+    "command.exportDocument": "Lua: Export Document ...",
     "config.IntelliSense.traceBeSetted": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
     "config.IntelliSense.traceFieldInject": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
     "config.IntelliSense.traceLocalSet": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
     "config.IntelliSense.traceReturn": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
+    "config.addonManager.enable": "",
     "config.codeLens.enable": "Enable code lens.",
     "config.color.mode": "Color mode.",
     "config.color.mode.Grammar": "Grammar color.",
@@ -219,4 +220,4 @@
     "config.workspace.supportScheme": "Provide language server for the Lua files of the following scheme.",
     "config.workspace.useGitIgnore": "Ignore files list in `.gitignore` .",
     "config.workspace.userThirdParty": "Add private third-party library configuration file paths here, please refer to the built-in [configuration file path](https://github.com/LuaLS/lua-language-server/tree/master/meta/3rd)"
-}
+}
\ No newline at end of file
diff --git a/package.nls.pt-br.json b/package.nls.pt-br.json
index ad191da98fd2be63e9ef19c93d264bf717114ffb..4ec0e377a60c7fd9b2c86ccaed0e838cdc51e379 100644
--- a/package.nls.pt-br.json
+++ b/package.nls.pt-br.json
@@ -1,10 +1,11 @@
 {
-    "command.exportDocument": "Export Document ...",
-    "config.addonManager.enable": "Set the on/off state for the addon manager.",
+    "command.addon_manager.open": "Lua: Open Addon Manager ...",
+    "command.exportDocument": "Lua: Export Document ...",
     "config.IntelliSense.traceBeSetted": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
     "config.IntelliSense.traceFieldInject": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
     "config.IntelliSense.traceLocalSet": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
     "config.IntelliSense.traceReturn": "Please read [wiki](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features) to learn more.",
+    "config.addonManager.enable": "",
     "config.codeLens.enable": "Enable code lens.",
     "config.color.mode": "Color mode.",
     "config.color.mode.Grammar": "Grammar color.",
@@ -219,4 +220,4 @@
     "config.workspace.supportScheme": "Provide language server for the Lua files of the following scheme.",
     "config.workspace.useGitIgnore": "Ignore files list in `.gitignore` .",
     "config.workspace.userThirdParty": "Add private third-party library configuration file paths here, please refer to the built-in [configuration file path](https://github.com/LuaLS/lua-language-server/tree/master/meta/3rd)"
-}
+}
\ No newline at end of file
diff --git a/package.nls.zh-cn.json b/package.nls.zh-cn.json
index 74ce1278dffd425ba9709cc13d9077cee75c1a8f..db2f790ccbce4a3ae4f241c482755493a0d71028 100644
--- a/package.nls.zh-cn.json
+++ b/package.nls.zh-cn.json
@@ -1,10 +1,11 @@
 {
-    "command.exportDocument": "导出文档...",
-    "config.addonManager.enable": "Set the on/off state for the addon manager.",
+    "command.addon_manager.open": "Lua: 打开插件管理器...",
+    "command.exportDocument": "Lua: 导出文档...",
     "config.IntelliSense.traceBeSetted": "请查阅[文档](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)了解用法。",
     "config.IntelliSense.traceFieldInject": "请查阅[文档](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)了解用法。",
     "config.IntelliSense.traceLocalSet": "请查阅[文档](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)了解用法。",
     "config.IntelliSense.traceReturn": "请查阅[文档](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)了解用法。",
+    "config.addonManager.enable": "",
     "config.codeLens.enable": "启用代码度量。",
     "config.color.mode": "着色模式。",
     "config.color.mode.Grammar": "语法着色。",
@@ -219,4 +220,4 @@
     "config.workspace.supportScheme": "为以下 scheme 的lua文件提供语言服务。",
     "config.workspace.useGitIgnore": "忽略 `.gitignore` 中列举的文件。",
     "config.workspace.userThirdParty": "在这里添加私有的第三方库适配文件路径，请参考内置的[配置文件路径](https://github.com/LuaLS/lua-language-server/tree/master/meta/3rd)"
-}
+}
\ No newline at end of file
diff --git a/package.nls.zh-tw.json b/package.nls.zh-tw.json
index 14537dde6f2e952223445eb705538c973c111fe1..ba568fd06f81b46767b3aaea070d4993d948eb3e 100644
--- a/package.nls.zh-tw.json
+++ b/package.nls.zh-tw.json
@@ -1,10 +1,11 @@
 {
-    "command.exportDocument": "Export Document ...",
-    "config.addonManager.enable": "Set the on/off state for the addon manager.",
+    "command.addon_manager.open": "Lua: Open Addon Manager ...",
+    "command.exportDocument": "Lua: Export Document ...",
     "config.IntelliSense.traceBeSetted": "請查閱[文件](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)瞭解用法。",
     "config.IntelliSense.traceFieldInject": "請查閱[文件](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)瞭解用法。",
     "config.IntelliSense.traceLocalSet": "請查閱[文件](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)瞭解用法。",
     "config.IntelliSense.traceReturn": "請查閱[文件](https://github.com/LuaLS/lua-language-server/wiki/IntelliSense-optional-features)瞭解用法。",
+    "config.addonManager.enable": "",
     "config.codeLens.enable": "Enable code lens.",
     "config.color.mode": "著色模式。",
     "config.color.mode.Grammar": "語法著色。",
@@ -219,4 +220,4 @@
     "config.workspace.supportScheme": "為以下 `scheme` 的lua檔案提供語言伺服。",
     "config.workspace.useGitIgnore": "忽略 `.gitignore` 中列舉的檔案。",
     "config.workspace.userThirdParty": "在這裡添加私有的第三方庫適應檔案路徑，請參考內建的[組態檔案路徑](https://github.com/LuaLS/lua-language-server/tree/master/meta/3rd)"
-}
+}
\ No newline at end of file
diff --git a/package/build.lua b/package/build.lua
index 7cc74f7c4e9b371bebf0ba13ac5d5cf2112060f5..572e90fae08b2aac65c53da4ce553c73dd50f5ea 100644
--- a/package/build.lua
+++ b/package/build.lua
@@ -1,6 +1,6 @@
 local json = require 'json-beautify'
 
-local VERSION = "3.6.11"
+local VERSION = "3.6.12"
 
 local package = require 'package.package'
 local fsu     = require 'fs-utility'
diff --git a/server b/server
index 21420c986d807a55e22dd9b4261c3e3279a19eb0..b5187993b553d11b89c9dca70f509cd45a4b7f72 160000
--- a/server
+++ b/server
@@ -1 +1 @@
-Subproject commit 21420c986d807a55e22dd9b4261c3e3279a19eb0
+Subproject commit b5187993b553d11b89c9dca70f509cd45a4b7f72
diff --git a/setting/schema-pt-br.json b/setting/schema-pt-br.json
index d326e744e960e37bf5c3f2bedb470817b5ffa131..48e84bbc20162cbf70964cd3dac6954e232bfa3f 100644
--- a/setting/schema-pt-br.json
+++ b/setting/schema-pt-br.json
@@ -9,8 +9,8 @@
             }
         },
         "addonManager.enable": {
-            "default": true,
-            "markdownDescription": "Set the on/off state for the addon manager.",
+            "default": false,
+            "markdownDescription": "",
             "scope": "resource",
             "type": "boolean"
         },
@@ -3149,4 +3149,4 @@
     },
     "title": "setting",
     "type": "object"
-}
+}
\ No newline at end of file
diff --git a/setting/schema-zh-cn.json b/setting/schema-zh-cn.json
index 43652defc4764b1e9924e76c93441fb22cd44016..2a50b8e6048be3e19c3d68afb914ea96cd0ace27 100644
--- a/setting/schema-zh-cn.json
+++ b/setting/schema-zh-cn.json
@@ -9,8 +9,8 @@
             }
         },
         "addonManager.enable": {
-            "default": true,
-            "markdownDescription": "Set the on/off state for the addon manager.",
+            "default": false,
+            "markdownDescription": "",
             "scope": "resource",
             "type": "boolean"
         },
@@ -3149,4 +3149,4 @@
     },
     "title": "setting",
     "type": "object"
-}
+}
\ No newline at end of file
diff --git a/setting/schema-zh-tw.json b/setting/schema-zh-tw.json
index 2270ca3fe59ed140f65dfecb51ce2e9aac9fc7af..86c021d2e69fc366ec65d087c3551b7365b7511d 100644
--- a/setting/schema-zh-tw.json
+++ b/setting/schema-zh-tw.json
@@ -9,8 +9,8 @@
             }
         },
         "addonManager.enable": {
-            "default": true,
-            "markdownDescription": "Set the on/off state for the addon manager.",
+            "default": false,
+            "markdownDescription": "",
             "scope": "resource",
             "type": "boolean"
         },
@@ -3149,4 +3149,4 @@
     },
     "title": "setting",
     "type": "object"
-}
+}
\ No newline at end of file
diff --git a/setting/schema.json b/setting/schema.json
index c507ce9df68b603d060d3ad25c509d81102c1ab2..4bf7cf03729384781ca02ac3c6de6ef673334428 100644
--- a/setting/schema.json
+++ b/setting/schema.json
@@ -9,8 +9,8 @@
             }
         },
         "addonManager.enable": {
-            "default": true,
-            "markdownDescription": "Set the on/off state for the addon manager.",
+            "default": false,
+            "markdownDescription": "",
             "scope": "resource",
             "type": "boolean"
         },
@@ -3149,4 +3149,4 @@
     },
     "title": "setting",
     "type": "object"
-}
+}
\ No newline at end of file