Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-12-05 03:03:31 +00:00
Code Issues Projects Releases Wiki Activity
1,035 Commits 7 Branches 22 Tags 136 MiB
b4d457d78a
Commit Graph

1035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
memetrollsXD
ebecbe8733 Propose a Contributing COC 2022-04-23 22:44:52 +02:00
memetrollsXD
fd1890b072 Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
memetrollsXD
6dae4d43fe Add level parameter to README 2022-04-23 22:33:52 +02:00
Magix
cf84877937 Merge pull request #138 from WangYneos/stable 
make mitmproxy ignore non Genshin hosts
 2022-04-23 16:30:40 -04:00
Magix
002edb8474 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
a945c2188f Merge pull request #109 from xmplay/xmplay-readme 
fix typos and grammar in README.md
 2022-04-23 16:28:31 -04:00
Magix
262a049bd7 Merge branch 'development' into xmplay-readme 2022-04-23 16:28:13 -04:00
Magix
1b9d1e4ba8 Merge pull request #162 from omg-xtao/development 
Add Teleport command
 2022-04-23 16:17:31 -04:00
xtaodada
2dd8932144 Add Teleport command 2022-04-24 03:10:07 +08:00
Yazawazi
3baef42aac Name Card Done!!!!!!!!!!! 2022-04-23 23:48:06 +08:00
Benjamin Elsdon
9e7c9f4670 Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-23 23:07:38 +08:00
Benjamin Elsdon
cb03b654bc 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
ad1c3f9a3b Will 2022-04-23 22:16:59 +08:00
Yazawazi
aa4489497e Merge branch 'Grasscutters:development' into development 2022-04-23 22:16:21 +08:00
memetrollsXD
57e3637251 Add promoteLevel and count 2022-04-23 16:11:45 +02:00
Melledy
d612530cdd Merge pull request #157 from omg-xtao/development 
Add another way to set talent level
 2022-04-23 07:04:52 -07:00
Melledy
4f8e73285a Merge pull request #156 from RealHeart/patch-2 
Update README.md
 2022-04-23 07:04:21 -07:00
xtaodada
301d0a174c Add another way to set talent level 2022-04-23 21:13:45 +08:00
Yazawazi
3bc249f042 Try to give name card 2022-04-23 21:03:29 +08:00
真心
6a4534d33d Update README.md 2022-04-23 20:51:36 +08:00
Yazawazi
042bdc2ff2 Merge branch 'Grasscutters:development' into development 2022-04-23 19:58:17 +08:00
Melledy
9fab2682ee Merge pull request #153 from TheLostTree/main 
Handle drowning
 2022-04-23 04:39:02 -07:00
Melledy
283e92dac6 Merge pull request #152 from Grasscutters/revert-151-main 
Revert "Drowning packets handled"
 2022-04-23 04:37:26 -07:00
Melledy
16a7c9dd67 Revert "Drowning packets handled" 2022-04-23 04:36:34 -07:00
Melledy
7af01e0793 Merge pull request #151 from TheLostTree/main 
Drowning packets handled
 2022-04-23 03:34:05 -07:00
TheLostTree
31f617e7f0 Update Grasscutter-Protos 2022-04-23 03:32:18 -07:00
TheLostTree
3d9b71dc4d git doesnt like me 2022-04-23 03:32:08 -07:00
TheLostTree
91894380cb drowning added 2022-04-23 03:19:33 -07:00
Melledy
20e9e77508 Merge pull request #146 from MlgmXyysd/panel 
Make some control panel happy
 2022-04-23 02:02:04 -07:00
Jaida Wu
3eabd40345 Make some control panel happy 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 16:47:13 +08:00
WangYneos
6554c37d9c Merge branch 'development' into stable 2022-04-23 16:23:15 +08:00
Melledy
df1dca8d87 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
561833b1ee Merge pull request #143 from MlgmXyysd/c2r-fix 
Fix proxy daemon can't find script
 2022-04-23 01:11:08 -07:00
Melledy
89712e3179 Merge pull request #144 from MlgmXyysd/birthday-fix 
Fix PlayerBirthday exception
 2022-04-23 01:10:48 -07:00
Jaida Wu
cd08c52b35 Fix PlayerBirthday exception 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 15:39:56 +08:00
Jaida Wu
1c3df04f45 Fix proxy daemon can't find script 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-23 15:33:10 +08:00
WangYneos
39e590dfb8 Fix Syntax 2022-04-23 14:28:14 +08:00
KingRainbow44
8afcc0b89a Add message for bind failure (HTTP) 2022-04-23 02:20:18 -04:00
KingRainbow44
832c460a83 Implement packet send/receive events 2022-04-23 02:08:31 -04:00
KingRainbow44
600decbc09 Implement region events 2022-04-23 01:59:06 -04:00
KingRainbow44
6056e962d6 Implement an event handler 2022-04-23 01:58:37 -04:00
WangYneos
22e5ca5545 Update start.cmd 2022-04-23 13:57:48 +08:00
KingRainbow44
7a3fbcdcf7 Plugin enabling & disabling 2022-04-23 01:17:35 -04:00
KingRainbow44
3ba8c42b42 Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
15da839503 Update Grasscutter for Java 16 & Plugins 2022-04-23 00:53:11 -04:00
Melledy
a957379afb Merge pull request #131 from Raeliana/patch-1 
Create ClearWeaponsCommand.java
 2022-04-22 21:36:52 -07:00
Melledy
02c852716a Merge pull request #136 from miyucchi/development 
Save birthday date
 2022-04-22 21:35:58 -07:00
Melledy
3ed6a99445 Merge pull request #127 from yarik0chka/development 
Implemented sitting
 2022-04-22 21:34:36 -07:00
WangYneos
ae00eb69d6 Update README.md 2022-04-23 12:07:23 +08:00
WangYneos
c77aa3ff79 make mitmproxy ignore non Genshin hosts 2022-04-23 12:02:10 +08:00