Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development (a751e71d) · Commits · ziqian zhang / Grasscutter · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Grasscutter
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ziqian zhang
Grasscutter
Commits
a751e71d

Commit a751e71d authored 3 years ago by

Melledy

Downloads
- Plain Diff

Merge branch 'development' of https://github.com/Grasscutters/Grasscutter into development

parents 248b655f 741e5749

Branches

Tags

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
data/GameAnnouncementList.json 9 additions, 1 deletion

data/GameAnnouncementList.json
src/main/java/emu/grasscutter/command/commands/JoinCommand.java 46 additions, 0 deletions

...in/java/emu/grasscutter/command/commands/JoinCommand.java
src/main/java/emu/grasscutter/command/commands/QuestCommand.java 2 additions, 2 deletions

...n/java/emu/grasscutter/command/commands/QuestCommand.java
src/main/java/emu/grasscutter/command/commands/RemoveCommand.java 43 additions, 0 deletions

.../java/emu/grasscutter/command/commands/RemoveCommand.java
src/main/java/emu/grasscutter/game/Account.java 8 additions, 7 deletions

src/main/java/emu/grasscutter/game/Account.java
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java 6 additions, 0 deletions

.../java/emu/grasscutter/server/dispatch/DispatchServer.java
src/main/java/emu/grasscutter/server/dispatch/http/AnnouncementIndexHandler.java 61 additions, 0 deletions

...cutter/server/dispatch/http/AnnouncementIndexHandler.java
src/main/resources/languages/en-US.json 9 additions, 0 deletions

src/main/resources/languages/en-US.json
src/main/resources/languages/zh-CN.json 9 additions, 0 deletions

src/main/resources/languages/zh-CN.json
src/main/resources/languages/zh-TW.json 13 additions, 0 deletions

src/main/resources/languages/zh-TW.json

with 207 additions and 10 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment