Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-22 17:51:53 +00:00
Code Issues Projects Releases Wiki Activity
296 Commits 7 Branches 22 Tags 133 MiB
40953dd845
Commit Graph

296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Magix
40953dd845 Merge pull request #186 from FahimFBA/fba-code-of-conduct 
Code of Conduct Added
 2022-04-24 13:20:23 -04:00
FahimFBA
4c7051bb6a Update CODE_OF_CONDUCT.md 2022-04-24 19:24:23 +06:00
FahimFBA
a65cc94e24 Update CODE_OF_CONDUCT.md 
Changed the mail address to the Discord server
 2022-04-24 19:23:23 +06:00
FahimFBA
5a508bce55 Update CODE_OF_CONDUCT.md 
Added the email address. Please change the mail address as you see fit.
 2022-04-24 16:38:30 +06:00
FahimFBA
fc23d3e0bd Create CODE_OF_CONDUCT.md 2022-04-24 16:35:53 +06:00
Magix
795a4cde3c Merge pull request #163 from memetrollsXD/patch-1 
Propose a Contributing COC
 2022-04-24 00:57:59 -04:00
memetrollsXD
11df62969c Fix another weird line break 2022-04-24 00:06:56 +02:00
memetrollsXD
1ebba3af38 Fix "weird spacing" 2022-04-24 00:05:40 +02:00
memetrollsXD
ebecbe8733 Propose a Contributing COC 2022-04-23 22:44:52 +02:00
Melledy
283e92dac6 Merge pull request #152 from Grasscutters/revert-151-main 
Revert "Drowning packets handled"
 2022-04-23 04:37:26 -07:00
Melledy
16a7c9dd67 Revert "Drowning packets handled" 2022-04-23 04:36:34 -07:00
Melledy
7af01e0793 Merge pull request #151 from TheLostTree/main 
Drowning packets handled
 2022-04-23 03:34:05 -07:00
TheLostTree
31f617e7f0 Update Grasscutter-Protos 2022-04-23 03:32:18 -07:00
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
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
PasserbyAlpha
68218cbb49 fixed encoding problem when generating gm handbook 2022-04-22 23:11:29 +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
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
fengyuecanzhu
ff778914cb remove revive command 2022-04-22 08:26:48 +08:00
fengyuecanzhu
28db79876b add fullfp command 2022-04-22 08:08:47 +08:00
Yazawazi
2350f0ebe2 ee, forget to change variables when copying from local 2022-04-22 07:49:35 +08:00
Yazawazi
044c2a3086 typo 2022-04-22 07:42:17 +08:00
Yazawazi
eedab79253 fetter try 2022-04-22 07:37:25 +08:00
Magix
b09d8a2a4a Merge pull request #63 from JuliusPtolemy/main 
Update development readme
 2022-04-21 18:51:08 -04:00
Magix
a572097329 Merge branch 'development' into main 2022-04-21 18:50:57 -04:00
Melledy
16318b3793 Merge pull request #74 from 4Benj/development 
Server run modes and multi-server dispatch support
 2022-04-21 15:06:57 -07:00
Melledy
8b5d78557f Merge pull request #92 from Grasscutters/account-fix 
Fixes for the error in the revive command
 2022-04-21 14:48:18 -07:00
Melledy
04791b68be Refactor Revive Command + fix syntax error 
No idea how I missed the syntax error while reviewing
 2022-04-21 14:47:04 -07:00
Melledy
e884970ac4 Merge branch 'development' into account-fix 2022-04-21 14:46:07 -07:00
Melledy
58535dd1ce Save config everytime you load so the new options show up 2022-04-21 14:44:55 -07:00
Melledy
db1c4cd462 Merge pull request #88 from alt3ri/development 
Added /revive command
 2022-04-21 14:05:09 -07:00