shkong

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-16 06:09:42 +08:00

e876894bca Merge pull request #1271 from loulou310/development

715ec01eda Patreon Link

d76216b764 Merge branch 'Grasscutters:development' into development

e8c34bc12f Translated readme in FRENCH

Compare 4 commits »

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-15 21:59:42 +08:00

b3f1103292 [Ready]Replace deprecated KCP library (#1237)

2d4bfa7c31 Update README.md

94c940401b Update README_zh-CN.md

Compare 3 commits »

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-15 13:49:42 +08:00

a329b3bdac Fix multi server function

bba7afa24e Don't show internal server error on gacha with full inventory.

ed290b6a39 Only send full clear notification on burst cast.

b9f6d7f70b Adapt protocol for clearing energy.

73013eb497 Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at once

Compare 5 commits »

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-15 05:39:42 +08:00

5925619b40 Merge pull request #1263 from loulou310/development

2a03aaff5e Added fr-FR.json

Compare 2 commits »

shkong synced commits to lang-french at shkong/Grasscutter from mirror 2022-06-15 05:39:42 +08:00

shkong synced new reference lang-french to shkong/Grasscutter from mirror 2022-06-15 05:39:42 +08:00

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-14 21:29:42 +08:00

f10dc1cf8d fix healing ability of some characters to some extent (#1201)

64d74387a2 Minor README update (#1246)

f2f6993b3d KickCommand: Remove unnecessary subpermission

ded7ce1dcf Implement Resin (#1257)

Compare 4 commits »

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-13 20:59:41 +08:00

2560b14557 Partial revert of #1245

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-13 12:49:42 +08:00

794750827d Command: Add permissionTargeted or targetRequirement

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-12 12:19:42 +08:00

52e9c05440 Add alternate name for tranSceneId, and fix inconsistent indentation.

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-11 19:59:41 +08:00

7126b1569e make sure towerData is not null (#1240)

ef9d96b6d8 Language: Update translation

Compare 2 commits »

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-11 11:49:41 +08:00

2c54d1dac6 Change the version to 1.2.1-dev

shkong synced commits to stable at shkong/Grasscutter from mirror 2022-06-10 19:29:43 +08:00

e5dd407a64 Change version to 1.2.0

shkong synced commits to refs/tags/v1.2.0 at shkong/Grasscutter from mirror 2022-06-10 19:29:43 +08:00

shkong synced new reference refs/tags/v1.2.0 to shkong/Grasscutter from mirror 2022-06-10 19:29:43 +08:00

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-10 11:19:42 +08:00

f67649e56f Fix inconformity of Player Object at TowerManager (#1226)

shkong synced commits to main at shkong/Grasscutter_Resources from mirror 2022-06-09 02:39:42 +08:00

6a4f84ecc6 Update README.md

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-09 02:39:41 +08:00

992742d746 Proxy Update

6149e326ba Make UI for blueprint unlocking behave.

51637ab01e Make calculation for partial claims better.

840bea2b0f Make the UI behave.

e30516d698 Send periodic notifications to the client for ongoing forges.

Compare 15 commits »

shkong synced commits to development at shkong/Grasscutter from mirror 2022-06-08 02:09:43 +08:00

662c9d4ec2 Merge pull request #1215 from Grasscutters/stable

610d24d84c Merge branch 'development' into stable

1136a5dd4f Delete BuildConfig.java

45d18bc1b6 Issue template updated no more headache (#965)

d00feaa0f0 Fixed grammar in README.md

Compare 6 commits »

shkong synced commits to stable at shkong/Grasscutter from mirror 2022-06-08 02:09:43 +08:00

610d24d84c Merge branch 'development' into stable

1136a5dd4f Delete BuildConfig.java

9bf48ddbf7 Fix unable to save game data occasionally (#1194)

36fb08095f add new command (unlimitenergy):toggle energyusage for each player (#1186)

d4bb7c95b6 List game & server version when starting server (#1181)

Compare 341 commits »