Merge branch 'development' into api

# Conflicts: # src/main/java/emu/grasscutter/plugin/api/ServerHook.java

Merge branch 'development' into api
# Conflicts: # src/main/java/emu/grasscutter/plugin/api/ServerHook.java
d32f706c · KingRainbow44 · 47d8fd3c · f0d728b4 · d32f706c · d32f706c
Commit d32f706c authored Apr 27, 2022 by KingRainbow44
--- a/src/main/java/emu/grasscutter/task/TaskHandler.java
+++ b/src/main/java/emu/grasscutter/task/TaskHandler.java
--- a/src/main/java/emu/grasscutter/task/TaskMap.java
+++ b/src/main/java/emu/grasscutter/task/TaskMap.java
--- a/src/main/java/emu/grasscutter/task/tasks/MoonCard.java
+++ b/src/main/java/emu/grasscutter/task/tasks/MoonCard.java
--- a/src/main/java/emu/grasscutter/tools/Tools.java
+++ b/src/main/java/emu/grasscutter/tools/Tools.java
--- a/src/main/java/emu/grasscutter/utils/Crypto.java
+++ b/src/main/java/emu/grasscutter/utils/Crypto.java
--- a/src/main/java/emu/grasscutter/utils/DateHelper.java
+++ b/src/main/java/emu/grasscutter/utils/DateHelper.java
--- a/src/main/java/emu/grasscutter/utils/Utils.java
+++ b/src/main/java/emu/grasscutter/utils/Utils.java
--- a/start.cmd
+++ b/start.cmd