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
fumbling
91b685586e
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
fd42dd558f
change fhp to heal
2022-04-22 08:45:46 +08:00
Yazawazi
cb043e0644
no more NullPointerException pls
2022-04-22 08:30:02 +08:00
fengyuecanzhu
85fd060561
remove revive command
2022-04-22 08:26:48 +08:00
fengyuecanzhu
a47655db7a
add fullfp command
2022-04-22 08:08:47 +08:00
Yazawazi
1c6aa32cea
ee, forget to change variables when copying from local
2022-04-22 07:49:35 +08:00
Yazawazi
a3f528ede0
typo
2022-04-22 07:42:17 +08:00
Yazawazi
6b8b6b4899
fetter try
2022-04-22 07:37:25 +08:00
Magix
f248aa5e7e
Merge pull request #63 from JuliusPtolemy/main
...
Update development readme
2022-04-21 18:51:08 -04:00
Magix
1817b7289d
Merge branch 'development' into main
2022-04-21 18:50:57 -04:00
Melledy
a05f8270ab
Merge pull request #74 from 4Benj/development
...
Server run modes and multi-server dispatch support
2022-04-21 15:06:57 -07:00
Melledy
9cf49c3a76
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
eb44fc88c4
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
18707f9309
Merge branch 'development' into account-fix
2022-04-21 14:46:07 -07:00
Melledy
d19d80fa4e
Save config everytime you load so the new options show up
2022-04-21 14:44:55 -07:00
Melledy
860e28e56a
Merge pull request #88 from alt3ri/development
...
Added /revive command
2022-04-21 14:05:09 -07:00
Melledy
dd72af60b7
Merge pull request #90 from Grasscutters/account-fix
...
Fix account dupe key error after selecting starting character
2022-04-21 14:04:10 -07:00
Melledy
dca137a93e
Fix account dupe key error after selecting starting character
2022-04-21 14:02:17 -07:00
alt3ri
96a252f9dd
Added /revive command
...
Now it's more convenient to revive character without food :>
2022-04-22 02:28:52 +07:00
Melledy
a93398a18b
Merge pull request #86 from alt3ri/patch-7
...
Fix typo
2022-04-21 11:47:30 -07:00
Melledy
29fe983f67
Merge pull request #84 from yarik0chka/development
...
Add a changing weather id
2022-04-21 11:47:13 -07:00
Melledy
dbb9ce0997
Merge pull request #87 from Yazawazi/development
...
Teleport Small Fix
2022-04-21 11:46:51 -07:00
Yazawazi
a01783ef3c
Teleport Small Fix
2022-04-22 02:23:02 +08:00
alt3ri
2cc8d48fde
Fix typo
...
"When you create a new account via auto register or console server then during scene select a character and write a name on it press it it will get stuck and make the server disconnected. Some can get through and some can't passed it, so currently I'm still on the stable version . even how many times have I deleted the datebase and tried it on some linux and directly on windows too :/ btw 6863600865/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131)https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760 )
Thanks [Yuki#4985](https://discord.com/channels/965284035985305680/965284036333424722/966756877100789760 )
2022-04-22 00:54:06 +07:00
yarik0chka
38c0c9eb7c
Add a changing weather id
2022-04-21 22:21:24 +05:00
Benjamin Elsdon
ff6958ed1f
Forgot a dispatch prefix on error while merging
2022-04-22 01:15:05 +08:00
Benjamin Elsdon
96da53b5fb
Merge remote-tracking branch 'upstream/development' into development
2022-04-22 01:04:03 +08:00
Melledy
6863600865
Merge pull request #78 from MlgmXyysd/dispatch-refactor
...
Refact dispatch server
2022-04-21 09:03:53 -07:00
