Commit Graph

365 Commits

Author SHA1 Message Date
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
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
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
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
Melledy
b507d2c2c9
Merge pull request #121 from MlgmXyysd/front-https
Add FrontHTTPS field to Dispatch server
2022-04-22 06:48:39 -07:00
Jaida Wu
746e16a25a
Add FrontHTTPS field to Dispatch server
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 21:25:58 +08:00
Melledy
e86932606a Revert "Explicitly load and save UTF-8 for the handbook"
This reverts commit fe6e9967db.
2022-04-22 05:20:02 -07:00
Melledy
db0e39bd72
Merge pull request #113 from 01101sam/patch-1
[typo] Fix resources folder tips
2022-04-22 04:38:04 -07:00
Melledy
08e3d7e4fb
Merge pull request #114 from alt3ri/development
Added /talent command
2022-04-22 04:35:10 -07:00
Melledy
e4681ba5be
Merge pull request #108 from fumbling644o/development
GM handbook: Explicitly load and save UTF-8
2022-04-22 04:33:05 -07:00
alt3ri
f8c31cfd96
Deleted 2 lines 2022-04-22 17:38:58 +07:00
alt3ri
1548c2a8d7
Added /talent command
Set current character talent level by using /talent command.
> /talent getid - Gets current character talent ID
> /talent set <talent ID> <level> - Sets current character's talent level
2022-04-22 17:28:52 +07:00
Sam
21f82519cf
[typo-upd] Add missing folder 2022-04-22 17:43:06 +08:00
Sam
9715c1d646
[typo] Fix resources folder tips 2022-04-22 17:36:24 +08:00
xmplay
30cdf7c65e
Update README.md 2022-04-22 09:55:44 +02:00
xmplay
292c4df145
fix typos and grammar in README.md 2022-04-22 09:52:33 +02:00
Melledy
edf657b447
Merge pull request #104 from 4Benj/development
Log files
2022-04-22 00:34:44 -07:00
Melledy
389ebdef43
Merge pull request #107 from memetrollsXD/development
Keep development branch up to date with stable branch
2022-04-22 00:32:34 -07:00
fumbling
fe6e9967db Explicitly load and save UTF-8 for the handbook
This fixes potential output issues for non-Latin scripts when exporting the handbook by changing the filename in the code.
2022-04-22 02:32:27 -04:00
memetrollsXD
d87cb5bef5 Merge branch 'stable' into development 2022-04-22 07:56:30 +02:00
Benjamin Elsdon
c638359302 Log files 2022-04-22 13:05:06 +08:00
Magix
7fdeb72e01
Merge pull request #102 from SpikeHD/github_action_build
GitHub build action
2022-04-22 00:22:49 -04:00
SpikeHD
1989d552b9
only build on stable 2022-04-21 21:21:08 -07:00
SpikeHD
e4fc815cd8
upload artifact 2022-04-21 21:13:38 -07:00
SpikeHD
dde88db895
build steps 2022-04-21 21:04:00 -07:00
SpikeHD
671d2f1898
Update build.yml 2022-04-21 20:57:30 -07:00
SpikeHD
976d841837 begin compile env setup 2022-04-21 20:55:43 -07:00
SpikeHD
523329d1a0 create empty action file 2022-04-21 20:52:23 -07:00
Magix
72f4407543
Merge pull request #100 from MlgmXyysd/patch-1
Update README.md
2022-04-21 23:48:20 -04:00
Jaida Wu
195b602fcc
Update README.md 2022-04-22 11:46:55 +08:00
Magix
fa6bc66ea5
Update Grasscutter to v1.0.0
Merge development into stable (and all the support hell that comes with it).
2022-04-21 23:42:04 -04:00
Magix
a72a2060c6
Merge pull request #98 from MlgmXyysd/mongodb
Integrate MongoDB into C2R
2022-04-21 23:38:46 -04:00
Jaida Wu
8d78897a29
Allow configuration overrides
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 11:34:22 +08:00
Jaida Wu
1133ffd9aa
Integrate MongoDB into C2R
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 11:33:54 +08:00
Jaida Wu
c157aaec5b
Make proxy daemon run imperceptibly
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
2022-04-22 11:32:49 +08:00
Magix
e76b60d7c7
Merge pull request #94 from Yazawazi/development
Try to show characters' stories and voices
2022-04-21 23:12:02 -04:00
Magix
94b80f0f3f
Merge pull request #93 from fengyuecanzhu/development
add heal command
2022-04-21 23:11:23 -04:00
Yazawazi
d37543beaf
cache fetters 2022-04-22 10:39:25 +08:00
Magix
9840598477
Changes for Morphia 2.x upgrade
Morphia call fixes; add `@Entity` to more classes
2022-04-21 22:26:41 -04:00