Skip to content

Commit

Permalink
Merge branch 'Cog-Creators:V3/develop' into V3/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
MeatyChunks authored Mar 24, 2024
2 parents 32e5b16 + 0b390fe commit b20b61d
Show file tree
Hide file tree
Showing 35 changed files with 153 additions and 126 deletions.
23 changes: 21 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
.. Red changelogs
Redbot 3.5.7 (2024-03-24)
=========================

| Thanks to all these amazing people that contributed to this release:
| :ghuser:`aikaterna`, :ghuser:`Flame442`, :ghuser:`karlsbjorn`, :ghuser:`Jackenmen`
This is a hotfix release fixing a bug with Red's reaction-based menus introduced in the previous release.

End-user changelog
------------------

Fixes
*****

- **Core** - Fixed an issue with Red's reaction-based menus *with custom controls* not working properly (:issue:`6324`)
- **Core - Bot Commands** - Updated supported image formats in ``[p]set bot avatar``'s error messages to include GIFs (:issue:`6323`)

----

Redbot 3.5.6 (2024-03-22)
=========================

Expand Down Expand Up @@ -63,12 +82,12 @@ Changes
- **Core - Utils Package** - The `menu()` utility function received a new `provisional <developer-guarantees-exclusions>` ``user`` parameter for defining who can interact with the menu (instead of the default ``ctx.author``) (:issue:`4913`)

If no issues arise, we plan on including this parameter under developer guarantees
in the first release made after 2024-05-18.
in the first release made after 2024-05-24.

- **Core - Utils Package** - The `SimpleMenu.start()` method received a new `provisional <developer-guarantees-exclusions>` ``user`` parameter for defining who can interact with the menu (instead of the default ``ctx.author``) (:issue:`4913`)

If no issues arise, we plan on including this parameter under developer guarantees
in the first release made after 2024-05-18.
in the first release made after 2024-05-24.

Fixes
*****
Expand Down
2 changes: 1 addition & 1 deletion redbot/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ def _early_init():


# This is bumped automatically by release workflow (`.github/workflows/scripts/bump_version.py`)
_VERSION = "3.5.7.dev1"
_VERSION = "3.5.8.dev1"

__version__, version_info = VersionInfo._get_version()

Expand Down
4 changes: 2 additions & 2 deletions redbot/core/core_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -2889,11 +2889,11 @@ async def _set_bot_avatar(self, ctx: commands.Context, url: str = None):
_(
"Failed. Remember that you can edit my avatar "
"up to two times a hour. The URL or attachment "
"must be a valid image in either JPG or PNG format."
"must be a valid image in either JPG, PNG, or GIF format."
)
)
except ValueError:
await ctx.send(_("JPG / PNG format only."))
await ctx.send(_("JPG / PNG / GIF format only."))
else:
await ctx.send(_("Done."))

Expand Down
8 changes: 4 additions & 4 deletions redbot/core/locales/ar-SA.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions redbot/core/locales/bg-BG.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions redbot/core/locales/cs-CZ.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions redbot/core/locales/da-DK.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions redbot/core/locales/de-DE.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions redbot/core/locales/es-ES.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions redbot/core/locales/fi-FI.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions redbot/core/locales/fr-FR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions redbot/core/locales/hi-IN.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions redbot/core/locales/hr-HR.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions redbot/core/locales/hu-HU.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions redbot/core/locales/id-ID.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions redbot/core/locales/it-IT.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b20b61d

Please sign in to comment.