Merge remote-tracking branch 'origin/unstable' into unstable

Browse Source

# Conflicts:
#	src/main/java/emu/grasscutter/auth/DefaultAuthenticators.java
#	src/main/java/emu/grasscutter/game/ability/AbilityManager.java

...

This commit is contained in:

KingRainbow44 2023-05-31 19:18:13 -04:00

parent 25b75b9691 36a5661a21

commit 16ec2e3d40

No known key found for this signature in database

GPG Key ID: FC2CB64B00D257BE

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available