Commit Graph

1035 Commits

Author SHA1 Message Date
memetrollsXD
6799778669
Propose a Contributing COC 2022-04-23 22:44:52 +02:00
memetrollsXD
b1508183f8
Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
memetrollsXD
f1fd9b1ca8 Add level parameter to README 2022-04-23 22:33:52 +02:00
Magix
fb2b98a6cf
Merge pull request #138 from WangYneos/stable
make mitmproxy ignore non Genshin hosts
2022-04-23 16:30:40 -04:00
Magix
c2ea6d78df
Merge pull request #137 from fumbling644o/development-actions
Workflow: Use Ubuntu and trigger on PR actions
2022-04-23 16:29:37 -04:00
Magix
cd22ce4ee1
Merge pull request #109 from xmplay/xmplay-readme
fix typos and grammar in README.md
2022-04-23 16:28:31 -04:00
Magix
4ddfd4c659
Merge branch 'development' into xmplay-readme 2022-04-23 16:28:13 -04:00
Magix
ede08f684a
Merge pull request #162 from omg-xtao/development
Add Teleport command
2022-04-23 16:17:31 -04:00
00f2da10df
Add Teleport command 2022-04-24 03:10:07 +08:00
Yazawazi
9c920b139a
Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Benjamin Elsdon
7fd1e4dacb Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-23 23:07:38 +08:00
Benjamin Elsdon
903e02c538 Added database support for mail
Send mail command now works from console (to use it from console change the uuid in the 'SendMailCommand' file
2022-04-23 23:07:18 +08:00
Yazawazi
88e1a0c555
Will 2022-04-23 22:16:59 +08:00
Yazawazi
984ee9d7ea
Merge branch 'Grasscutters:development' into development 2022-04-23 22:16:21 +08:00
memetrollsXD
5d145fb1d6 Add promoteLevel and count 2022-04-23 16:11:45 +02:00
Melledy
9e447964ee
Merge pull request #157 from omg-xtao/development
Add another way to set talent level
2022-04-23 07:04:52 -07:00
Melledy
20db82d79a
Merge pull request #156 from RealHeart/patch-2
Update README.md
2022-04-23 07:04:21 -07:00
d1d2be9b16
Add another way to set talent level 2022-04-23 21:13:45 +08:00
Yazawazi
45281695fe
Try to give name card 2022-04-23 21:03:29 +08:00
真心
07226e3121
Update README.md 2022-04-23 20:51:36 +08:00
Yazawazi
e970fdb60a
Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Melledy
690abd647e
Merge pull request #153 from TheLostTree/main
Handle drowning
2022-04-23 04:39:02 -07:00
Melledy
af8efe93d6
Merge pull request #152 from Grasscutters/revert-151-main
Revert "Drowning packets handled"
2022-04-23 04:37:26 -07:00
Melledy
f29cdd753a
Revert "Drowning packets handled" 2022-04-23 04:36:34 -07:00
Melledy
37316b70b2
Merge pull request #151 from TheLostTree/main
Drowning packets handled
2022-04-23 03:34:05 -07:00
TheLostTree
de3a2b6485 Update Grasscutter-Protos 2022-04-23 03:32:18 -07:00
TheLostTree
46aded281d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
d64044f931 drowning added 2022-04-23 03:19:33 -07:00
Melledy
4c66b31173
Merge pull request #146 from MlgmXyysd/panel
Make some control panel happy
2022-04-23 02:02:04 -07:00
Jaida Wu
46f40a9012
Make some control panel happy
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 16:47:13 +08:00
WangYneos
1fe6841947
Merge branch 'development' into stable 2022-04-23 16:23:15 +08:00
Melledy
ea9cda21e2
Merge pull request #141 from Grasscutters/bind-failure
Push a helpful error message to the console on bind failure
2022-04-23 01:14:51 -07:00
Melledy
fe9c7d1e0d
Merge pull request #143 from MlgmXyysd/c2r-fix
Fix proxy daemon can't find script
2022-04-23 01:11:08 -07:00
Melledy
2073e15a64
Merge pull request #144 from MlgmXyysd/birthday-fix
Fix PlayerBirthday exception
2022-04-23 01:10:48 -07:00
Jaida Wu
e38f5ca97b
Fix PlayerBirthday exception
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 15:39:56 +08:00
Jaida Wu
9b1f3c7735
Fix proxy daemon can't find script
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-23 15:33:10 +08:00
WangYneos
f155c649e9 Fix Syntax 2022-04-23 14:28:14 +08:00
KingRainbow44
bba4a00508
Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
KingRainbow44
c31312416a
Implement packet send/receive events 2022-04-23 02:08:31 -04:00
KingRainbow44
c676bb9f08
Implement region events 2022-04-23 01:59:06 -04:00
KingRainbow44
8b34222ceb
Implement an event handler 2022-04-23 01:58:37 -04:00
WangYneos
1dfeee9fd7
Update start.cmd 2022-04-23 13:57:48 +08:00
KingRainbow44
2a6984229e
Plugin enabling & disabling 2022-04-23 01:17:35 -04:00
KingRainbow44
ec6a54ebd7
Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
9b2e4e3fa9
Update Grasscutter for Java 16 & Plugins 2022-04-23 00:53:11 -04:00
Melledy
90c9af7257
Merge pull request #131 from Raeliana/patch-1
Create ClearWeaponsCommand.java
2022-04-22 21:36:52 -07:00
Melledy
473a90432f
Merge pull request #136 from miyucchi/development
Save birthday date
2022-04-22 21:35:58 -07:00
Melledy
bdfd92e7a3
Merge pull request #127 from yarik0chka/development
Implemented sitting
2022-04-22 21:34:36 -07:00
WangYneos
59f043d69b
Update README.md 2022-04-23 12:07:23 +08:00
WangYneos
54d519fee3 make mitmproxy ignore non Genshin hosts 2022-04-23 12:02:10 +08:00