KingRainbow44 541433c01b Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0 ...

# Conflicts:
#	src/main/java/emu/grasscutter/game/player/Player.java
#	src/main/java/emu/grasscutter/game/player/TeamManager.java
#	src/main/java/emu/grasscutter/game/world/Scene.java

2023-08-31 21:06:13 -04:00

..

BasePlayerDataManager.java

Fix whitespace [skip actions]

2022-07-21 00:22:26 -07:00

BasePlayerManager.java

Merge unstable into development (#2173)

2023-05-31 23:48:16 -04:00

InvokeHandler.java

Merge unstable into development (#2173)

2023-05-31 23:48:16 -04:00

Player.java

Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0

2023-08-31 21:06:13 -04:00

PlayerBirthday.java

Merge unstable into development (#2173)

2023-05-31 23:48:16 -04:00

PlayerBuffManager.java

Merge unstable into development (#2173)

2023-05-31 23:48:16 -04:00

PlayerCodex.java

Merge unstable into development (#2173)

2023-05-31 23:48:16 -04:00

PlayerCollectionRecords.java

Merge unstable into development (#2173)

2023-05-31 23:48:16 -04:00

PlayerProgress.java

Run the formatter & Generate protocol definitions

2023-08-26 19:51:45 -04:00

PlayerProgressManager.java

Fix battle in front of glowy stag god (#2188)

2023-06-03 10:54:46 -04:00

TeamInfo.java

Format code [skip actions]

2023-06-02 18:26:45 +00:00

TeamManager.java

Merge remote-tracking branch 'origin/dev-4.0' into dev-4.0

2023-08-31 21:06:13 -04:00