Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-28 10:45:25 +00:00
Code Issues Projects Releases Wiki Activity
312 Commits 7 Branches 22 Tags 133 MiB
ffb9ccfe07
Commit Graph

312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
[DATA EXPUNGED] ███
52b7dc5e7f fix vbs generation when path is empty 2022-04-23 09:37:30 +08: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
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
PasserbyAlpha
6cc0fdaeed use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
xtaodada
4605c6506e Add PublicPort field to server 2022-04-23 01:42:04 +08:00
xtaodada
104d10352b Add PublicPort field to Dispatch server 2022-04-23 01:16:55 +08:00
PasserbyAlpha
68218cbb49 fixed encoding problem when generating gm handbook 2022-04-22 23:11:29 +08:00
Jaida Wu
8b3b419abc Update proxy.py 2022-04-22 22:00:13 +08:00
Melledy
12c6020b71 Merge pull request #121 from MlgmXyysd/front-https 
Add FrontHTTPS field to Dispatch server
 2022-04-22 06:48:39 -07:00
Jaida Wu
e02917a527 Add FrontHTTPS field to Dispatch server 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 21:25:58 +08:00
Melledy
9b23bfa556 Revert "Explicitly load and save UTF-8 for the handbook" 
This reverts commit 215ee2a3b2.
 2022-04-22 05:20:02 -07:00
Melledy
f4f8a86a8c Merge pull request #113 from 01101sam/patch-1 
[typo] Fix resources folder tips
 2022-04-22 04:38:04 -07:00
Melledy
acd59d1788 Merge pull request #114 from alt3ri/development 
Added /talent command
 2022-04-22 04:35:10 -07:00
Melledy
95c6b9486d Merge pull request #108 from fumbling644o/development 
GM handbook: Explicitly load and save UTF-8
 2022-04-22 04:33:05 -07:00
alt3ri
63898a18df Deleted 2 lines 2022-04-22 17:38:58 +07:00
alt3ri
370483fae2 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
2aaf70c031 [typo-upd] Add missing folder 2022-04-22 17:43:06 +08:00
Sam
b629e8c652 [typo] Fix resources folder tips 2022-04-22 17:36:24 +08:00
Melledy
dff860e205 Merge pull request #104 from 4Benj/development 
Log files
 2022-04-22 00:34:44 -07:00
Melledy
1862da3f58 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
215ee2a3b2 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
e6402c3198 Merge branch 'stable' into development 2022-04-22 07:56:30 +02:00
Benjamin Elsdon
46b527df4d Log files 2022-04-22 13:05:06 +08:00
Magix
1dfe87335a Merge pull request #102 from SpikeHD/github_action_build 
GitHub build action
 2022-04-22 00:22:49 -04:00
SpikeHD
99c9f0111b only build on stable 2022-04-21 21:21:08 -07:00
SpikeHD
e576884b05 upload artifact 2022-04-21 21:13:38 -07:00
SpikeHD
d84d7d48aa build steps 2022-04-21 21:04:00 -07:00
SpikeHD
b4dd5c81d0 Update build.yml 2022-04-21 20:57:30 -07:00
SpikeHD
36e18277d4 begin compile env setup 2022-04-21 20:55:43 -07:00
SpikeHD
4963f071d4 create empty action file 2022-04-21 20:52:23 -07:00
Magix
f574ce0164 Merge pull request #100 from MlgmXyysd/patch-1 
Update README.md
 2022-04-21 23:48:20 -04:00
Jaida Wu
198bdcc63c Update README.md 2022-04-22 11:46:55 +08:00
Magix
6e81dc3989 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
4e1ea6abb6 Merge pull request #98 from MlgmXyysd/mongodb 
Integrate MongoDB into C2R
 2022-04-21 23:38:46 -04:00
Jaida Wu
725851f5a1 Allow configuration overrides 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 11:34:22 +08:00
Jaida Wu
b336d89962 Integrate MongoDB into C2R 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 11:33:54 +08:00
Jaida Wu
7bc944544d Make proxy daemon run imperceptibly 
Signed-off-by: Jaida Wu <mlgmxyysd@meowcat.org>
 2022-04-22 11:32:49 +08:00
Magix
1cf1a951dd Merge pull request #94 from Yazawazi/development 
Try to show characters' stories and voices
 2022-04-21 23:12:02 -04:00
Magix
fc45d08170 Merge pull request #93 from fengyuecanzhu/development 
add heal command
 2022-04-21 23:11:23 -04:00
Yazawazi
123fc263ba cache fetters 2022-04-22 10:39:25 +08:00
Magix
09c8ed34ee Changes for Morphia 2.x upgrade 
Morphia call fixes; add `@Entity` to more classes
 2022-04-21 22:26:41 -04:00
fumbling
06101f1b9c Morphia call fixes; add @Entity to more classes 
1. During the conversion of Morphia calls to the new API, some of the `Filter.eq()` calls had their `field` set to `playerId` due to a copy/paste typo.

2. Morphia 2 switches to the codec system, so anything that will be serialized in the pipeline requires the `@Entity` annotation.
 2022-04-21 22:19:47 -04:00
fengyuecanzhu
b31dab04eb change fhp to heal 2022-04-22 08:45:46 +08:00
Yazawazi
376c668dd9 no more NullPointerException pls 2022-04-22 08:30:02 +08:00