400 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Melledy	690abd647e	Merge pull request #153 from TheLostTree/main ... Handle drowning	2022-04-23 04:39:02 -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
WangYneos	1dfeee9fd7	Update start.cmd	2022-04-23 13:57:48 +08: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
[DATA EXPUNGED] ███	66a6042a24	fix vbs generation when path is empty	2022-04-23 09:37:30 +08:00
Miyucchi	6d53f2d6ac	Feature: SetBirthdayDate	2022-04-23 03:29:08 +02:00
Miyucchi	e2543483ff	Profile set birthday feature	2022-04-23 03:22:32 +02:00
Raeliana	f04f1ec5ce	Create ClearWeaponsCommand.java ... A command to clear unlocked and unequipped artifacts	2022-04-23 02:48:04 +03:00
Melledy	b7b6263115	Merge pull request #122 from MlgmXyysd/proxy ... Update proxy.py	2022-04-22 16:35:01 -07:00
Melledy	5c1f48a5aa	Merge branch 'stable' into development	2022-04-22 16:34:41 -07:00
Yazawazi	53659d2586	AvatarFetterLevelReward	2022-04-23 06:08:37 +08:00
Melledy	e76c6a5e67	Merge pull request #126 from omg-xtao/development ... Add PublicPort field to Dispatch server	2022-04-22 14:45:03 -07:00
Melledy	a23bb50fd2	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	d341e4f245	Use count for level for equips	2022-04-22 23:19:58 +02:00
PasserbyAlpha	2750d5da2d	use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o]	2022-04-23 02:28:34 +08:00
yarik0chka	266443b321	Implemented sitting	2022-04-22 23:24:51 +05:00
xtaodada	04c0e968ed	Add PublicPort field to server	2022-04-23 01:42:04 +08:00
Yazawazi	f9b5c8a9ee	command fix	2022-04-23 01:36:48 +08:00
xtaodada	26c3651cc8	Add PublicPort field to Dispatch server	2022-04-23 01:16:55 +08:00
Yazawazi	34c0c6b01b	setfetterlevel command	2022-04-22 23:46:24 +08:00
PasserbyAlpha	1b39f67032	fixed encoding problem when generating gm handbook	2022-04-22 23:11:29 +08:00
Yazawazi	9edb70d6cf	AvatarFetterLevel	2022-04-22 22:27:40 +08:00
Jaida Wu	a185cd167e	Update proxy.py	2022-04-22 22:00:13 +08:00