diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6a4ac5806e..af6ab70854 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -34,7 +34,7 @@ We welcome anyone to contribute to this repository. Issues that we are actively ## Pull Request process -When contributing to this repository, please first discuss the change you wish to make via issue or [Slack](https://acemod.org/slack) with the [ACE3 project maintainers](https://ace3.acemod.org/team.html) before making a change. This may not be necessary if you are contributing for something which has an existing issue in our repository already. +When contributing to this repository, please first discuss the change you wish to make via issue or [Discord](https://acemod.org/discord) with the [ACE3 project maintainers](https://ace3.acemod.org/team.html) before making a change. This may not be necessary if you are contributing for something which has an existing issue in our repository already. 1. Please make a pull request (PR) as early as possible. This lets use help you in the proces of developing it. When opening a work in progress pull request, mark your PR with a `WIP:` prefix. 2. Describe what this pull request will do and how it solves this in the description of your PR. A clear intent and description of the way the issue is resolved will help us to review the PR more efficiently. @@ -47,4 +47,4 @@ Please note that all contributors to this project are volunteers and do this in ## Assistance with contributing -If you require assistance with contributing, check out the #dev channel on our [Slack](https://acemod.org/slack). Additional documentation can be found on our [Development wiki](https://ace3.acemod.org/wiki/development/). +If you require assistance with contributing, check out the #dev channel on our [Discord](https://acemod.org/discord). Additional documentation can be found on our [Development wiki](https://ace3.acemod.org/wiki/development/). diff --git a/README.md b/README.md index 8303a3ad6a..431d322e8e 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ ACE3 License - - ACE3 Slack + + ACE3 Discord ACE3 Build Status @@ -105,8 +105,8 @@ To help us test the latest development changes, download our master branch ([dir - - + + diff --git a/docs/README.zh-TW.md b/docs/README.zh-TW.md index f376516a91..4216d82dd7 100644 --- a/docs/README.zh-TW.md +++ b/docs/README.zh-TW.md @@ -18,8 +18,8 @@ ACE3 條款 - - 加入ACE3 Slack + + 加入ACE3 Discord ACE3 建構狀態 @@ -104,8 +104,8 @@ ACE3需要最新版本的武裝行動3以及最新版本的 Slack - + + diff --git a/docs/README_DE.md b/docs/README_DE.md index 9322c7b708..fd7eaeef3f 100644 --- a/docs/README_DE.md +++ b/docs/README_DE.md @@ -3,7 +3,7 @@

- + ACE3 Version @@ -15,8 +15,8 @@ ACE3 Lizenz - - ACE3 Slack + + ACE3 Discord ACE3 Build Status diff --git a/docs/README_PL.md b/docs/README_PL.md index 1f03d6601c..893261dc54 100644 --- a/docs/README_PL.md +++ b/docs/README_PL.md @@ -2,7 +2,7 @@

- + ACE3 Wersja @@ -14,8 +14,8 @@ ACE3 Licencja - - ACE3 Slack + + ACE3 Discord ACE3 Build Status diff --git a/docs/index.html b/docs/index.html index 2e5e9bd305..21df9af763 100644 --- a/docs/index.html +++ b/docs/index.html @@ -64,7 +64,7 @@ sitemap: and more.

-

ACE3 Public Chat
+

ACE3 Public Chat
Join our public chat! We're glad to answer questions concerning ACE3, development or Arma things.
If you made something with this mod (screen shots, artwork, videos) we'd love to see it.

diff --git a/docs/wiki/development/documentation-guidelines-and-tips.md b/docs/wiki/development/documentation-guidelines-and-tips.md index 5a508d14c6..e51960fefe 100644 --- a/docs/wiki/development/documentation-guidelines-and-tips.md +++ b/docs/wiki/development/documentation-guidelines-and-tips.md @@ -12,7 +12,7 @@ order: 19 - This is especially necessary for the kramdown markup syntax. Kramdown needs a line break between each block level element (paragraphs, lists, codeblocks, etc ...) - Use `ACE3` instead of `ACE 3`. - Remove each entry that is not used. -- Don't forget to say what you're going to work on in #documentation in slack or [this topic](https://github.com/acemod/ACE3/issues/1166) +- Don't forget to say what you're going to work on in #dev in Discord or [this topic](https://github.com/acemod/ACE3/issues/1166) - Keybinds in ``` keyboard tags ``` - Keywords in ``` `backticks` ``` - Capitals at the start of a sentence and `.`at the end.
SlackWe have a public Slack team that anyone can join. This is where all our developers and contributors hang out and where we make announcementsDiscordWe have a public Discord server that anyone can join. This is where all our developers and contributors hang out and where we make announcements
我們有著公共的Slack團隊供大家加入，而該模組所有開發者以及維護者也會在此出現並公告Discord我們有著公共的Discord團隊供大家加入，而該模組所有開發者以及維護者也會在此出現並公告