Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower (ccdce684) · 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
ccdce684

Commit ccdce684 authored 3 years ago by

Akka

Downloads
- Plain Diff

Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower

parents d468edcf 219a8508

Branches

Tags

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/emu/grasscutter/game/managers/StaminaManager/AfterUpdateStaminaListener.java 12 additions, 0 deletions

...e/managers/StaminaManager/AfterUpdateStaminaListener.java
src/main/java/emu/grasscutter/game/managers/StaminaManager/BeforeUpdateStaminaListener.java 20 additions, 0 deletions

.../managers/StaminaManager/BeforeUpdateStaminaListener.java
src/main/java/emu/grasscutter/game/managers/StaminaManager/ConsumptionType.java 4 additions, 4 deletions

...scutter/game/managers/StaminaManager/ConsumptionType.java
src/main/java/emu/grasscutter/game/managers/StaminaManager/README.md 73 additions, 0 deletions

...va/emu/grasscutter/game/managers/StaminaManager/README.md
src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java 197 additions, 82 deletions

...sscutter/game/managers/StaminaManager/StaminaManager.java
src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java 27 additions, 17 deletions

...er/server/packet/recv/HandlerCombatInvocationsNotify.java
src/main/resources/languages/zh-CN.json 71 additions, 34 deletions

src/main/resources/languages/zh-CN.json
src/main/resources/logback.xml 6 additions, 1 deletion

src/main/resources/logback.xml

with 410 additions and 138 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