Commit Graph

607 Commits

Author SHA1 Message Date
Melledy
d9e1ed5083 Merge branch 'stable' into development 2022-04-25 00:58:53 -07:00
Magix
cfeec14d01 Update issue templates 2022-04-25 00:56:31 -07:00
zhufengning
16e8439058 fix spelling in README_zh-CN.md 2022-04-25 00:55:07 -07:00
Asnxthaony
480374fb39 fix indent by using smart tabs 2022-04-25 00:54:11 -07:00
Asnxthaony
4e5d72a99a sanity check 2022-04-25 00:54:11 -07:00
Asnxthaony
122568ad27 fix SetPlayerBirthdayRsp 2022-04-25 00:54:11 -07:00
Benjamin Elsdon
4c7bd69eb0 Mail read notify 2022-04-25 15:41:18 +08:00
BaiSugar
c6bd1fa5d4 remove test avatar 2022-04-25 15:17:55 +08:00
Magix
16ef907f6f Update issue templates 2022-04-25 02:54:48 -04:00
Benjamin Elsdon
721d8b7223 Deleting mail + a bit of cleanup 2022-04-25 14:30:56 +08:00
Benjamin Elsdon
785effe8da Receiving items in mail 2022-04-25 13:51:19 +08:00
Wansn
b6801cf427 Update README_zh-CN.md 2022-04-24 21:58:35 -07:00
Wansn
0a497b3626 Create README_zh-CN.md 2022-04-24 21:58:35 -07:00
Wansn
f7d9be5c05 Fix outdated jdk versions in some places 2022-04-24 21:58:35 -07:00
Wansn
bbda2e96db Fix outdated jdk versions in some places 2022-04-24 21:58:35 -07:00
Wansn
67990b4684 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
570f869786 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
848efc2298 Update README.md 2022-04-24 20:18:46 -07:00
Wansn
6666fef81a Update README.md 2022-04-24 20:18:46 -07:00
Yan
2238a7c3aa fix setting electro dmg stat 2022-04-24 17:57:42 -07:00
alangy98
21b3ac103a Revert "bugfix: portbind error when falling back to http server"
This reverts commit 4817ed9c52.
the bugfix is inappropriate
2022-04-24 17:57:18 -07:00
alt3ri
4837ccb983 Added UID parameter
Now you can delete other player's weapons with UID
Usage: /clearwp [uid]
2022-04-24 17:56:49 -07:00
Yazawazi
5010b8ac75 add setfriendship aliases 2022-04-24 10:32:47 -07:00
Magix
40953dd845 Merge pull request #186 from FahimFBA/fba-code-of-conduct
Code of Conduct Added
2022-04-24 13:20:23 -04:00
Melledy
bfefb2a022 Merge pull request #194 from alangy98/development
bugfix: port bind error when falling back to http server
2022-04-24 09:03:25 -07:00
Alangy
4817ed9c52 bugfix: portbind error when falling back to http server 2022-04-24 23:05:08 +08:00
BaiSugar
1c15dd3c32 fix 2022-04-24 22:49:33 +08:00
BaiSugar
5eeea84f8e Corrected format 2022-04-24 22:46:43 +08:00
BaiSugar
885e2d078c Corrected format 2022-04-24 22:45:30 +08:00
BaiSugar
f3d561cd06 Revert "Corrected format"
This reverts commit 60319ee9eb.
2022-04-24 22:42:44 +08:00
BaiSugar
60319ee9eb Corrected format 2022-04-24 22:38:53 +08:00
Melledy
a8ed99c94f Merge pull request #182 from RimuruChan/development
Fix a spelling mistake
2022-04-24 07:22:27 -07:00
Melledy
dfbf67c81e Merge pull request #181 from lunaticwhat/development
corrected some information for dev branch
2022-04-24 07:22:09 -07:00
Melledy
929bb38f2e Merge pull request #180 from Yazawazi/development
Fix the property prompt issue in fetter system
2022-04-24 07:21:34 -07:00
Melledy
edd0bccf5a Merge pull request #167 from memetrollsXD/development
Try to fix "No SSL cert found bind exception"
2022-04-24 07:16:05 -07:00
Melledy
bce8fb00e5 Merge pull request #190 from RimuruChan/patch-1
Update build.gradle
2022-04-24 07:15:03 -07:00
BaiSugar
0796957751 Added command to get all items 2022-04-24 21:52:50 +08:00
雪碧
46d89f5f5c Update build.gradle
fix three cve.
2022-04-24 21:32:48 +08:00
FahimFBA
4c7051bb6a Update CODE_OF_CONDUCT.md 2022-04-24 19:24:23 +06:00
FahimFBA
a65cc94e24 Update CODE_OF_CONDUCT.md
Changed the mail address to the Discord server
2022-04-24 19:23:23 +06:00
Benjamin Elsdon
94a75cf903 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
FahimFBA
5a508bce55 Update CODE_OF_CONDUCT.md
Added the email address. Please change the mail address as you see fit.
2022-04-24 16:38:30 +06:00
FahimFBA
fc23d3e0bd Create CODE_OF_CONDUCT.md 2022-04-24 16:35:53 +06:00
memetrollsXD
8066b16417 Add .vscode to gitignore and use @fumbling644o's implementation 2022-04-24 12:24:41 +02:00
Benjamin Elsdon
f556bff333 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
c25e809f5c Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
RimuruChan
96c0210707 Fix a spelling mistake 2022-04-24 15:35:22 +08:00
lunaticwhat
26b68479e7 corrected some information for dev branch 2022-04-24 14:34:29 +07:00
Yazawazi
23f0406b57 command fix too 2022-04-24 15:10:25 +08:00
Yazawazi
5c0c4fe67e Merge branch 'Grasscutters:development' into development 2022-04-24 15:03:58 +08:00