Bump version to 11.1.1 to include campaign updates as 11.1.0 was alre… (#3415 )

…ady taken
Bump braces from 3.0.2 to 3.0.3 in /client (#3408 )
2025-11-10 14:22:26 +00:00 · 2024-06-22 17:23:08 +10:00 · 2024-06-21 22:21:08 +10:00 · 2024-06-21 22:10:56 +10:00 · 2024-06-14 21:25:34 +10:00
5 changed files with 6 additions and 6 deletions
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -31,7 +31,7 @@ body:
        If the bug was found in a development build, select "Development build"
        and provide a link to the build in the field below.
      options:
-        - 11.0.0
+        - 11.1.1
        - Development build
  - type: textarea
    attributes:
--- a/.github/ISSUE_TEMPLATE/new-game-bug.yml
+++ b/.github/ISSUE_TEMPLATE/new-game-bug.yml
@@ -39,7 +39,7 @@ body:
        If the bug was found in a development build, select "Development build"
        and provide a link to the build in the field below.
      options:
-        - 11.0.0
+        - 11.1.1
        - Development build
  - type: textarea
    attributes:
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,6 @@
-# 11.1.0
+# 11.1.1

-Saves from 11.0.0 are compatible with 11.1.0. See Known Issues section for exceptions.
+Saves from 11.0.0 are compatible with 11.1.1. See Known Issues section for exceptions.

 ## Features/Improvements

--- a/docs/conf.py
+++ b/docs/conf.py
@@ -9,7 +9,7 @@
 project = "DCS Liberation"
 copyright = "2024, DCS Liberation Team"
 author = "DCS Liberation Team"
-release = "11.1.0"
+release = "11.1.1"

 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
--- a/game/version.py
+++ b/game/version.py
@@ -3,7 +3,7 @@ from pathlib import Path

 MAJOR_VERSION = 11
 MINOR_VERSION = 1
-MICRO_VERSION = 0
+MICRO_VERSION = 1
 VERSION_NUMBER = ".".join(str(v) for v in (MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION))
Author	SHA1	Message	Date
zhexu14	7543b5f79f	Bump version to 11.1.1 to include campaign updates as 11.1.0 was alre… (#3415 ) …ady taken	2024-06-22 17:23:08 +10:00
dependabot[bot]	708402b955	Bump braces from 3.0.2 to 3.0.3 in /client (#3408 ) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. <details> <summary>Commits</summary> <ul> <li><a href="`74b2db2938`"><code>74b2db2</code></a> 3.0.3</li> <li><a href="`88f1429a0f`"><code>88f1429</code></a> update eslint. lint, fix unit tests.</li> <li><a href="`415d660c30`"><code>415d660</code></a> Snyk js braces 6838727 (<a href="https://redirect.github.com/micromatch/braces/issues/40">#40</a>)</li> <li><a href="`190510f79d`"><code>190510f</code></a> fix tests, skip 1 test in test/braces.expand</li> <li><a href="`716eb9f12d`"><code>716eb9f</code></a> readme bump</li> <li><a href="`a5851e57f4`"><code>a5851e5</code></a> Merge pull request <a href="https://redirect.github.com/micromatch/braces/issues/37">#37</a> from coderaiser/fix/vulnerability</li> <li><a href="`2092bd1fb1`"><code>2092bd1</code></a> feature: braces: add maxSymbols (<a href="https://github.com/micromatch/braces/issues/">https://github.com/micromatch/braces/issues/</a>...</li> <li><a href="`9f5b4cf473`"><code>9f5b4cf</code></a> fix: vulnerability (<a href="https://security.snyk.io/vuln/SNYK-JS-BRACES-6838727">https://security.snyk.io/vuln/SNYK-JS-BRACES-6838727</a>)</li> <li><a href="`98414f9f1f`"><code>98414f9</code></a> remove funding file</li> <li><a href="`665ab5d561`"><code>665ab5d</code></a> update keepEscaping doc (<a href="https://redirect.github.com/micromatch/braces/issues/27">#27</a>)</li> <li>Additional commits viewable in <a href="https://github.com/micromatch/braces/compare/3.0.2...3.0.3">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=braces&package-manager=npm_and_yarn&previous-version=3.0.2&new-version=3.0.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/dcs-liberation/dcs_liberation/network/alerts). </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-06-21 22:21:08 +10:00
zhexu14	6a9cebe9b1	Campaign update fix (#3412 ) Update Starfire's campaigns. --------- Co-authored-by: Starfire13 <72491792+Starfire13@users.noreply.github.com>	2024-06-21 22:10:56 +10:00
Starfire13	36b687f7ef	Add NASAMs to MERAD unit list for campaign template (#3406 ) Adds NASAM launcher B and C to the list of units that can be placed in a campaign template to define a MERAD spawn location. This is needed to maintain compatibility with the new versions of my campaigns.	2024-06-14 21:25:34 +10:00