Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve merge conflicts from next -> main #567

Merged
merged 28 commits into from
Oct 16, 2023
Merged

Conversation

abitofevrything
Copy link
Member

No description provided.

l7ssha and others added 28 commits March 18, 2023 16:24
Fix TextChannelBuilder and VoiceChannelBuilder having wrong properties
…alised

Initialise guild caches even when guild is not from a create event
feat: animated icon/avatar/splash URL helpers on null
* Revert "ref: nullable `animated` for icon/avatar/splash URL properties (#475)"

This reverts commit 20c1bc8.

* fix: remove ifs

* Make `true` default value for `animated` prop

* [ci skip] fmt
* ref: nullable `animated` for icon/avatar/splash URL properties (#475)

feat: animated icon/avatar/splash URL helpers on null

* Revert #475 (#476)

* Revert "ref: nullable `animated` for icon/avatar/splash URL properties (#475)"

This reverts commit 20c1bc8.

* fix: remove ifs

* Make `true` default value for `animated` prop

* [ci skip] fmt

* Fix invalid casts

* Release 5.0.4

* Default animated to false for CDN urls

* Format files

---------

Co-authored-by: Ventus <[email protected]>
Co-authored-by: Rapougnac <[email protected]>
* feat: new username system

* Bad idea to put true animated here

* new release

* fix test

* new release

fix test

Release 5.1.0
# Conflicts:
#	lib/src/internal/cdn_http_endpoints.dart
@abitofevrything abitofevrything added this to the 6.0 milestone Oct 16, 2023
@abitofevrything abitofevrything self-assigned this Oct 16, 2023
@l7ssha l7ssha merged commit 18bca4a into next Oct 16, 2023
6 checks passed
@l7ssha l7ssha deleted the chore/resolve-main-conflicts branch October 16, 2023 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants