From c2295995f02b7ab4880d3d218bd4bec96f492d81 Mon Sep 17 00:00:00 2001 From: goaaats <16760685+goaaats@users.noreply.github.com> Date: Mon, 12 Jul 2021 00:12:04 +0200 Subject: [PATCH 1/2] ci: use powershell core --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f19420022..d9c1af8f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,7 +50,7 @@ jobs: path: .\scratch - name: Generate dalamud-distrib version file - shell: powershell + shell: pwsh run: | Compress-Archive .\scratch\* .\canary.zip # Recreate the release zip From 1755f0d3a553f24621c601158593213aeafa43bb Mon Sep 17 00:00:00 2001 From: goaaats <16760685+goaaats@users.noreply.github.com> Date: Mon, 12 Jul 2021 12:14:13 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index f85b9cc30..7069facfa 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,15 @@ If you need any support regarding the API or usage of Dalamud, please [join our Thanks to Mino, whose work has made this possible! +## Branches + +We are currently working from the following branches. + +| Name | Purpose | .NET Version | +|---|---|---| +| *master* | .NET Core rework, in-development, will replace stable | .NET 5.0.6 (May 2021) | +| *api3* | Legacy, current stable version, to be replaced in November | .NET 4.7.5 (April 2017) | +
##### Final Fantasy XIV © 2010-2021 SQUARE ENIX CO., LTD. All Rights Reserved. We are not affiliated with SQUARE ENIX CO., LTD. in any way.