diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 08c731127a..6a4ac5806e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -34,11 +34,11 @@ 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://slackin.ace3mod.com/) with the [ACE3 project maintainers](https://ace3mod.com/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 [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. 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. -3. Please follow our [Development Guidelines](https://ace3mod.com/wiki/development/). +3. Please follow our [Development Guidelines](https://ace3.acemod.org/wiki/development/). ### Notes @@ -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://slackin.ace3mod.com/). Additional documentation can be found on our [Development wiki](https://ace3mod.com/wiki/development/). +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/). diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2dd93748a3..c71190ce39 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -30,7 +30,7 @@ All good? Then proceed and fill out the items below. A clear and concise description of what the bug is. **Steps to reproduce:** -_Follow [https://ace3mod.com/img/wiki/user/issue_flowchart.png](this flowchart)!_ +_Follow [https://ace3.acemod.org/img/wiki/user/issue_flowchart.webp](this flowchart)!_ 1. _Go to ..._ 2. _Click ..._ diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 45e10cf0cb..2bba1a5dd1 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -9,4 +9,4 @@ assignees: '' ### Do not post feature requests here! -Learn how to make a feature request [here](https://ace3mod.com/wiki/user/how-to-make-a-feature-request.html). +Learn how to make a feature request [here](https://ace3.acemod.org/wiki/user/how-to-make-a-feature-request.html). diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 2f72a45b3b..5f42f937fe 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,6 +4,6 @@ ### IMPORTANT -- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs), please include your changes in this pull request so the documentation will appear on the [website](https://ace3mod.com/). -- [ ] [Development Guidelines](https://ace3mod.com/wiki/development/) are read, understood and applied. +- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/). +- [ ] [Development Guidelines](https://ace3.acemod.org/wiki/development/) are read, understood and applied. - [ ] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`. diff --git a/README.md b/README.md index e8599eac73..8303a3ad6a 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ ACE3 License - + ACE3 Slack @@ -78,8 +78,8 @@ The mod is **built modularly**, so almost any included PBO can be easily removed ACE3 requires Arma 3 and the latest version of CBA A3. See the following pages for help and information on how to get started with ACE3: -- [Installation guide](https://ace3mod.com/wiki/user/installation-guide.html) -- [Information center](https://ace3mod.com/wiki/user/information-center.html) +- [Installation guide](https://ace3.acemod.org/wiki/user/installation-guide.html) +- [Information center](https://ace3.acemod.org/wiki/user/information-center.html) ## Contributing @@ -87,25 +87,25 @@ You can help out with the ongoing development by looking for potential bugs in o ### Contribution guidelines -To contribute something to ACE3, simply fork this repository and submit your pull requests for review by other collaborators. See [the pull request guidelines](https://ace3mod.com/wiki/development/merging-pull-requests.html) for further information on this process. +To contribute something to ACE3, simply fork this repository and submit your pull requests for review by other collaborators. See [the pull request guidelines](https://ace3.acemod.org/wiki/development/merging-pull-requests.html) for further information on this process. ### Submitting issues and requesting features Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report a bug, propose a feature, or suggest changes to the existing ones. See also: -- [How to report an issue](https://ace3mod.com/wiki/user/how-to-report-an-issue.html) -- [How to make a feature request](https://ace3mod.com/wiki/user/how-to-make-a-feature-request.html) +- [How to report an issue](https://ace3.acemod.org/wiki/user/how-to-report-an-issue.html) +- [How to make a feature request](https://ace3.acemod.org/wiki/user/how-to-make-a-feature-request.html) ### Testing & building To help us test the latest development changes, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or [with git](https://help.github.com/articles/fetching-a-remote/)), then assemble a test build: -- [Setting up the development environment](https://ace3mod.com/wiki/development/setting-up-the-development-environment.html) – step-by-step instructions on how to properly setup and build a version of ACE3 for testing purposes. +- [Setting up the development environment](https://ace3.acemod.org/wiki/development/setting-up-the-development-environment.html) – step-by-step instructions on how to properly setup and build a version of ACE3 for testing purposes. ### Get in touch - + diff --git a/addons/explosives/functions/fnc_addDetonateHandler.sqf b/addons/explosives/functions/fnc_addDetonateHandler.sqf index b227b96d07..1345a73370 100644 --- a/addons/explosives/functions/fnc_addDetonateHandler.sqf +++ b/addons/explosives/functions/fnc_addDetonateHandler.sqf @@ -4,7 +4,7 @@ * Add a explosive detonation handler. * Should be called on all machines. * Code needs to return BOOL: true(allowed) / false(blocked) - * See https://ace3mod.com/wiki/framework/explosives-framework.html for an example. + * See https://ace3.acemod.org/wiki/framework/explosives-framework.html for an example. * * Arguments: * 0: Code diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index d61add87df..c76e7de673 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -18,21 +18,21 @@ ACE Lojistik - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ - http://ace3mod.com/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ + https://ace3.acemod.org/ diff --git a/addons/optionsmenu/config.cpp b/addons/optionsmenu/config.cpp index 5661753579..811b1eecec 100644 --- a/addons/optionsmenu/config.cpp +++ b/addons/optionsmenu/config.cpp @@ -38,6 +38,6 @@ class ACE_Extensions { class CfgCommands { allowedHTMLLoadURIs[] += { - "https://ace3mod.com/version.html" + "https://ace3.acemod.org/version.html" }; }; diff --git a/addons/optionsmenu/init_loadMainMenuBox.sqf b/addons/optionsmenu/init_loadMainMenuBox.sqf index 5b21d7aabb..78ba6e839d 100644 --- a/addons/optionsmenu/init_loadMainMenuBox.sqf +++ b/addons/optionsmenu/init_loadMainMenuBox.sqf @@ -51,7 +51,7 @@ if (profileNamespace getVariable [QGVAR(showNewsOnMainMenu), true]) then { _versionStr = _versionStr joinString "."; (_display displayCtrl IDC_MAIN_INFO_CURRENT_VERSION_INFO) ctrlSetText format ["Version: %1", _versionStr]; - (_display displayCtrl IDC_MAIN_INFO_NEWEST_VERSION_INFO) htmlLoad "https://ace3mod.com/version.html"; + (_display displayCtrl IDC_MAIN_INFO_NEWEST_VERSION_INFO) htmlLoad "https://ace3.acemod.org/version.html"; } else { _controlsGroup ctrlShow false; }; diff --git a/addons/spectator/README.md b/addons/spectator/README.md index 17d0c7b1f5..18cf2e585d 100644 --- a/addons/spectator/README.md +++ b/addons/spectator/README.md @@ -5,5 +5,5 @@ A flexible spectator framework for mission makers to use. Includes a public API for integration into custom respawn frameworks and a template for use with the vanilla respawn framework. -For more information, see: http://ace3mod.com/wiki/feature/spectator.html +For more information, see: http://ace3.acemod.org/wiki/feature/spectator.html diff --git a/docs/README.md b/docs/README.md index ee47a3cdd9..599940594c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -# Source of https://ace3mod.com/ +# Source of https://ace3.acemod.org/ ## Updating compiled JavaScript and CSS files diff --git a/docs/README.zh-TW.md b/docs/README.zh-TW.md index 933c2b50cb..f376516a91 100644 --- a/docs/README.zh-TW.md +++ b/docs/README.zh-TW.md @@ -18,7 +18,7 @@ ACE3 條款 - + 加入ACE3 Slack @@ -77,8 +77,8 @@ ## 新手起步 ACE3需要最新版本的武裝行動3以及最新版本的 CBA A3模組。以下的網頁可用於幫助以及提供安裝ACE3上的資訊。 -- [安裝指南-英文](https://ace3mod.com/wiki/user/installation-guide.html) -- [資訊中心-英文](https://ace3mod.com/wiki/user/information-center.html) +- [安裝指南-英文](https://ace3.acemod.org/wiki/user/installation-guide.html) +- [資訊中心-英文](https://ace3.acemod.org/wiki/user/information-center.html) ## 維護 @@ -91,20 +91,20 @@ ACE3需要最新版本的武裝行動3以及最新版本的 Slack + diff --git a/docs/README_DE.md b/docs/README_DE.md index 701939741a..9322c7b708 100644 --- a/docs/README_DE.md +++ b/docs/README_DE.md @@ -15,8 +15,8 @@ ACE3 Lizenz - - ACE3 Slack + + ACE3 Slack ACE3 Build Status @@ -70,14 +70,14 @@ Die Mod ist **modular aufgebaut**. Beinahe jede PBO kann entfernt werden, sodass #### Anleitungen Du hast ACE3 installiert, hast aber keine Ahnung was und wie alles funktioniert und wo sich was befindet? -- [Erste Schritte](https://ace3mod.com/wiki/user/getting-started.html). +- [Erste Schritte](https://ace3.acemod.org/wiki/user/getting-started.html). #### Mitwirken Wenn du bei der Entwicklung von ACE3 mithelfen möchtest, kannst du dies tun, indem du nach Fehlern Ausschau hältst oder neue Funktionen vorschlägst. Um etwas beizutragen, "Forke" dieses Repository und erstelle deine "Pull-Requests", welche von anderen Entwicklern und Beiträgern überprüft werden. Bitte trage dich dabei in [`AUTHORS.txt`](https://github.com/acemod/ACE3/blob/master/AUTHORS.txt) mit deinem Nutzernamen und einer gültigen Email-Adresse ein. Um uns einen Fehler, Anregungen oder neue Funktionalitäten mitzuteilen: Nutze unseren [Issue Tracker](https://github.com/acemod/ACE3/issues). Besuche auch: -- [Wie kann ich ein Problem melden](https://ace3mod.com/wiki/user/how-to-report-an-issue.html) -- [Wie kann ich ein Wunsch zu einer neuen Funktion mitteilen?](https://ace3mod.com/wiki/user/how-to-make-a-feature-request.html) +- [Wie kann ich ein Problem melden](https://ace3.acemod.org/wiki/user/how-to-report-an-issue.html) +- [Wie kann ich ein Wunsch zu einer neuen Funktion mitteilen?](https://ace3.acemod.org/wiki/user/how-to-make-a-feature-request.html) #### Testen & Mod erstellen Wenn du die neusten Entwicklungen erleben und uns dabei helfen möchtest bestehende Fehler zu entdecken, lade dir die "Master Branch" herunter. Entweder nutzt du [Git](https://help.github.com/articles/fetching-a-remote/) - wenn die Schritte bekannt sind - oder du lädst es dir direkt über [diesen Link](https://github.com/acemod/ACE3/archive/master.zip) herunter. diff --git a/docs/README_PL.md b/docs/README_PL.md index b99b96ca95..1f03d6601c 100644 --- a/docs/README_PL.md +++ b/docs/README_PL.md @@ -14,8 +14,8 @@ ACE3 Licencja - - ACE3 Slack + + ACE3 Slack ACE3 Build Status @@ -65,15 +65,15 @@ Modyfikacja ta jest **budowana modułowo**, dzięki temu prawie każdy dostarczo ### Poradniki i instrukcje Jeżeli zainstalowałeś ACE3 lecz masz problem ze zrozumieniem jak to wszystko działa, lub gdzie zacząć, zacznij od przeczytania tego: -- [Wprowadzenie](https://ace3mod.com/wiki/user/getting-started.html) +- [Wprowadzenie](https://ace3.acemod.org/wiki/user/getting-started.html) #### Współpraca Możesz pomóc w rozwoju addonu szukając potencjalnych bugów w naszym kodzie, lub zgłaszając nowe funkcje. Aby wnieść swój wkład do ACE3, po prostu zforkuj to repozytorium na swoje konto GitHub i zgłoś swoje pull requesty do przeglądu przez innych współpracowników. Pamiętaj, aby dodać siebie do listy autorów każdego PBO jakie edytujesz oraz do pliku ['AUTHORS.txt'](https://github.com/acemod/ACE3/blob/master/AUTHORS.txt) dodając także swój adres e-mail. Używaj naszego [Issue Tracker-a](https://github.com/acemod/ACE3/issues) aby zgłaszać bugi, proponować nowe funkcje lub sugerować zmiany do aktualnie istniejących. Zobacz także: -- [Jak zgłosić bug-a](https://ace3mod.com/wiki/user/how-to-report-an-issue.html) -- [Jak zgłosić feature request-a](https://ace3mod.com/wiki/user/how-to-make-a-feature-request.html) +- [Jak zgłosić bug-a](https://ace3.acemod.org/wiki/user/how-to-report-an-issue.html) +- [Jak zgłosić feature request-a](https://ace3.acemod.org/wiki/user/how-to-make-a-feature-request.html) #### Testowanie i budowanie Aby pomóc nam w testowaniu najnowszych zmian rozwojowych, pobierz nasz master branch ([bezpośrednio](https://github.com/acemod/ACE3/archive/master.zip), lub [korzystając z git](https://help.github.com/articles/fetching-a-remote/)), a następnie złóż testowego build-a: -- [Konfiguracja środowiska do testów](https://ace3mod.com/wiki/development/setting-up-the-development-environment.html) – intrukcja krok-po-kroku jak poprawnie ustawić i zbudować wersję ACE3 do celów testowych. +- [Konfiguracja środowiska do testów](https://ace3.acemod.org/wiki/development/setting-up-the-development-environment.html) – intrukcja krok-po-kroku jak poprawnie ustawić i zbudować wersję ACE3 do celów testowych. diff --git a/docs/_config.yml b/docs/_config.yml index 41888f6afc..4a69d58130 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -2,7 +2,7 @@ name: ACE3 description: ACE3 is a joint effort by the teams behind ACE 2, AGM and CSE to improve the realism and authenticity of Arma 3. keywords: Advanced Combat Enhancement 3, ACE, ACE3, Arma, Arma 3, Mod, Modification, Realism, AGM, CSE, Bohemia, Interactive -productionUrl: https://ace3mod.com +productionUrl: https://ace3.acemod.org ace: githubUrl: https://github.com/acemod/ACE3 diff --git a/docs/_includes/_footer.html b/docs/_includes/_footer.html index f0e19019ac..b269a8ea57 100644 --- a/docs/_includes/_footer.html +++ b/docs/_includes/_footer.html @@ -24,13 +24,12 @@ -
SlackSlack We have a public Slack team that anyone can join. This is where all our developers and contributors hang out and where we make announcements
Slack 我們有著公共的Slack團隊供大家加入，而該模組所有開發者以及維護者也會在此出現並公告