Commit Graph

734 Commits

Author SHA1 Message Date
Magix
0395ebfa15
Merge pull request #186 from FahimFBA/fba-code-of-conduct
Code of Conduct Added
2022-04-24 13:20:23 -04:00
Melledy
c8e9bb3669
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
c14eb2204b bugfix: portbind error when falling back to http server 2022-04-24 23:05:08 +08:00
BaiSugar
05c6b29831 fix 2022-04-24 22:49:33 +08:00
BaiSugar
1132c2c753 Corrected format 2022-04-24 22:46:43 +08:00
BaiSugar
5eccbc8565 Corrected format 2022-04-24 22:45:30 +08:00
BaiSugar
271f9b9ec5 Revert "Corrected format"
This reverts commit 153593b64c.
2022-04-24 22:42:44 +08:00
BaiSugar
153593b64c Corrected format 2022-04-24 22:38:53 +08:00
Melledy
d9200b4e31
Merge pull request #182 from RimuruChan/development
Fix a spelling mistake
2022-04-24 07:22:27 -07:00
Melledy
39babd8f3b
Merge pull request #181 from lunaticwhat/development
corrected some information for dev branch
2022-04-24 07:22:09 -07:00
Melledy
d04a4856df
Merge pull request #180 from Yazawazi/development
Fix the property prompt issue in fetter system
2022-04-24 07:21:34 -07:00
Melledy
146b1ebb6f
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
2fb0b54ce5
Merge pull request #190 from RimuruChan/patch-1
Update build.gradle
2022-04-24 07:15:03 -07:00
BaiSugar
95871abb5b Added command to get all items 2022-04-24 21:52:50 +08:00
雪碧
a7304b99ba
Update build.gradle
fix three cve.
2022-04-24 21:32:48 +08:00
FahimFBA
1374584059 Update CODE_OF_CONDUCT.md 2022-04-24 19:24:23 +06:00
FahimFBA
ef354935c2 Update CODE_OF_CONDUCT.md
Changed the mail address to the Discord server
2022-04-24 19:23:23 +06:00
Benjamin Elsdon
c7096f9e49 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
FahimFBA
62b04cfd53 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
252028d993 Create CODE_OF_CONDUCT.md 2022-04-24 16:35:53 +06:00
memetrollsXD
824e2f8f55 Add .vscode to gitignore and use @fumbling644o's implementation 2022-04-24 12:24:41 +02:00
Benjamin Elsdon
b10a889d76 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
9e81e10e64 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
RimuruChan
f456975418
Fix a spelling mistake 2022-04-24 15:35:22 +08:00
lunaticwhat
73c6c0e874 corrected some information for dev branch 2022-04-24 14:34:29 +07:00
Yazawazi
a743155039
command fix too 2022-04-24 15:10:25 +08:00
Yazawazi
5ed49a27e0
Merge branch 'Grasscutters:development' into development 2022-04-24 15:03:58 +08:00
Melledy
3c9a2ba846
Merge pull request #175 from omg-xtao/suicide
GodMode command supports playerId
2022-04-24 00:03:21 -07:00
Yazawazi
fb9f6c0bf4
Fix fetter system 2022-04-24 15:02:31 +08:00
Melledy
8953eefd10
Merge pull request #173 from Yazawazi/development
Add player level reward
2022-04-24 00:00:36 -07:00
BaiSugar
d761b50656 Added command to get all items 2022-04-24 14:01:03 +08:00
Yazawazi
232e9a470d
Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
Magix
3499b04e87
Merge pull request #163 from memetrollsXD/patch-1
Propose a Contributing COC
2022-04-24 00:57:59 -04:00
95411a6df3
GodMode command supports playerId 2022-04-24 11:40:10 +08:00
Yazawazi
1517c567c1
Player level reward 2022-04-24 11:25:13 +08:00
memetrollsXD
40cf40ce00 Remove last catch and init another variable as placeholder 2022-04-24 04:50:22 +02:00
memetrollsXD
47d34ebcd1 Forgot the toCharArray 2022-04-24 04:41:06 +02:00
memetrollsXD
b76dec2441 Notify user that new pw was used 2022-04-24 04:36:11 +02:00
memetrollsXD
e29b6744d4 Try to fix "No SSL cert found bind exception" 2022-04-24 04:34:17 +02:00
Melledy
2579c69c70
Merge pull request #166 from lunaticwhat/development
gitignore'd protos
2022-04-23 17:07:25 -07:00
lunaticwhat
6ece62d028 gitignore'd protos 2022-04-24 06:00:27 +07:00
Melledy
bae34b8072
Merge pull request #164 from miyucchi/development
Fix counter (Create a new account if exists issue)
2022-04-23 15:26:14 -07:00
Melledy
54ad583c67
Merge pull request #128 from memetrollsXD/development
Use count for level for equips (dev branch)
2022-04-23 15:15:22 -07:00
Melledy
368e4e5690
Merge pull request #124 from Yazawazi/development
Character fetter system
2022-04-23 15:15:09 -07:00
Miyucchi
c4cdc97d7b Fix counter 2022-04-24 00:10:26 +02:00
memetrollsXD
cc9b5e3ef7
Fix another weird line break 2022-04-24 00:06:56 +02:00
memetrollsXD
05cb81abf8
Fix "weird spacing" 2022-04-24 00:05:40 +02:00
Yazawazi
523d0260d0
tp with relative coordinates 2022-04-24 05:20:59 +08:00
Yazawazi
80cb967c86
Merge branch 'Grasscutters:development' into development 2022-04-24 05:03:55 +08:00
memetrollsXD
6799778669
Propose a Contributing COC 2022-04-23 22:44:52 +02:00