Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-19 10:24:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
574 Commits 7 Branches 22 Tags
6e73d4221deb11ae1f225539faf9ed3850ca62cc
Commit Graph

574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xtaodada
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
Magix
1933bfc95a Add keystore password 2022-04-22 23:53:37 -04:00
fumbling
80e3df947a Workflow: Switch from Temurin 8 to 16 2022-04-22 22:53:54 -04:00
fumbling
3881f84c01 Workflow: Use Ubuntu and add PR triggers 2022-04-22 22:53:54 -04:00
fumbling
c713b7afb2 Make gradlew executable 2022-04-22 22:53:54 -04:00
Yazawazi
23481cfe0c OpenCond for unlocking judgment 2022-04-23 10:51:22 +08:00
Yazawazi
eb57534a2a Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Magix
f47a6101db Update the keystore 
This is for Java 11+ purposes! The existing keystore will **not** work.
 2022-04-22 22:34:00 -04:00
Magix
37d139bbb5 Merge pull request #130 from Grasscutters/java-16 
Upgrade to versions of Java beyond 8
 2022-04-22 22:29:27 -04:00
Melledy
004d505528 Change java version requirement in readme 2022-04-22 19:26:48 -07:00
Melledy
17abf321a2 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
Melledy
706e40d9d0 Merge pull request #134 from lwd-temp/stable 
Fix vbs generation when %MITMDUMP_PATH% or %MONGODB_PATH% is empty
 2022-04-22 18:57:38 -07:00