Commit Graph

456 Commits

Author SHA1 Message Date
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
Magix
0992fc11b4 Add keystore password 2022-04-22 23:53:37 -04:00
fumbling
220f252f0f Workflow: Switch from Temurin 8 to 16 2022-04-22 22:53:54 -04:00
fumbling
d1d8378e15 Workflow: Use Ubuntu and add PR triggers 2022-04-22 22:53:54 -04:00
fumbling
3707ee5477 Make gradlew executable 2022-04-22 22:53:54 -04:00
Yazawazi
5ea5ea238c OpenCond for unlocking judgment 2022-04-23 10:51:22 +08:00
Yazawazi
b11009f724 Merge branch 'Grasscutters:development' into development 2022-04-23 10:43:27 +08:00
Magix
b98860c480 Update the keystore
This is for Java 11+ purposes! The existing keystore will **not** work.
2022-04-22 22:34:00 -04:00
Magix
ffb9ccfe07 Merge pull request #130 from Grasscutters/java-16
Upgrade to versions of Java beyond 8
2022-04-22 22:29:27 -04:00
Melledy
7b9447602b Change java version requirement in readme 2022-04-22 19:26:48 -07:00
Melledy
716380a078 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
Melledy
627d3ddabe 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
KingRainbow44
e3d6b86dd9 Basic plugin manager 2022-04-22 21:45:44 -04:00
[DATA EXPUNGED] ███
52b7dc5e7f fix vbs generation when path is empty 2022-04-23 09:37:30 +08:00
Miyucchi
539970fd50 Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
7fd0b371d0 Profile set birthday feature 2022-04-23 03:22:32 +02:00
KingRainbow44
1a056d2d13 Move manifest to resources 2022-04-22 20:42:55 -04:00
Raeliana
cdf6c697f1 Create ClearWeaponsCommand.java
A command to clear unlocked and unequipped artifacts
2022-04-23 02:48:04 +03:00
Melledy
0c89c2dd73 Merge pull request #122 from MlgmXyysd/proxy
Update proxy.py
2022-04-22 16:35:01 -07:00
Melledy
dffffc8d49 Merge branch 'stable' into development 2022-04-22 16:34:41 -07:00
Yazawazi
7ccecda07c AvatarFetterLevelReward 2022-04-23 06:08:37 +08:00
Melledy
5100729a5a Merge pull request #126 from omg-xtao/development
Add PublicPort field to Dispatch server
2022-04-22 14:45:03 -07:00
Melledy
ca6315f29a Merge pull request #125 from PasserbyAlpha/fix_encoding_in_handbook
fixed encoding problem when generating gm handbook
2022-04-22 14:36:47 -07:00
memetrollsXD
a52eaf9bbc Use count for level for equips 2022-04-22 23:19:58 +02:00
PasserbyAlpha
6cc0fdaeed use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
yarik0chka
3ca181e76d Implemented sitting 2022-04-22 23:24:51 +05:00
4605c6506e Add PublicPort field to server 2022-04-23 01:42:04 +08:00