Commit Graph

212 Commits

Author SHA1 Message Date
KingRainbow44
3ba8c42b42 Merge origin/development into plugin-system 2022-04-23 00:55:31 -04:00
KingRainbow44
15da839503 Update Grasscutter for Java 16 & Plugins 2022-04-23 00:53:11 -04:00
Melledy
a957379afb Merge pull request #131 from Raeliana/patch-1
Create ClearWeaponsCommand.java
2022-04-22 21:36:52 -07:00
Melledy
02c852716a Merge pull request #136 from miyucchi/development
Save birthday date
2022-04-22 21:35:58 -07:00
Melledy
3ed6a99445 Merge pull request #127 from yarik0chka/development
Implemented sitting
2022-04-22 21:34:36 -07:00
Magix
0992fc11b4 Add keystore password 2022-04-22 23:53:37 -04:00
Melledy
716380a078 Merge branch 'development' into java-16 2022-04-22 19:23:32 -07:00
KingRainbow44
e3d6b86dd9 Basic plugin manager 2022-04-22 21:45:44 -04:00
Miyucchi
539970fd50 Feature: SetBirthdayDate 2022-04-23 03:29:08 +02:00
Miyucchi
7fd0b371d0 Profile set birthday feature 2022-04-23 03:22:32 +02:00
KingRainbow44
1a056d2d13 Move manifest to resources 2022-04-22 20:42:55 -04:00
Raeliana
cdf6c697f1 Create ClearWeaponsCommand.java
A command to clear unlocked and unequipped artifacts
2022-04-23 02:48:04 +03:00
Melledy
dffffc8d49 Merge branch 'stable' into development 2022-04-22 16:34:41 -07:00
PasserbyAlpha
6cc0fdaeed use OutputStreamWriter to ensure the charset of output is utf8 [from fumbling644o] 2022-04-23 02:28:34 +08:00
yarik0chka
3ca181e76d Implemented sitting 2022-04-22 23:24:51 +05:00
4605c6506e Add PublicPort field to server 2022-04-23 01:42:04 +08:00
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
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
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
Benjamin Elsdon
46b527df4d Log files 2022-04-22 13:05:06 +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
Yazawazi
123fc263ba cache fetters 2022-04-22 10:39:25 +08: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
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
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
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
Melledy
e10bad5b17 Fix account dupe key error after selecting starting character 2022-04-21 14:02:17 -07:00
alt3ri
abe05a9b5d Added /revive command
Now it's more convenient to revive character without food :>
2022-04-22 02:28:52 +07:00
Melledy
c8100394d9 Merge pull request #86 from alt3ri/patch-7
Fix typo
2022-04-21 11:47:30 -07:00
Melledy
4431469334 Merge pull request #84 from yarik0chka/development
Add a changing weather id
2022-04-21 11:47:13 -07:00
Yazawazi
069cb1c6d3 Teleport Small Fix 2022-04-22 02:23:02 +08:00
alt3ri
452e89b4db 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 0e7976f906/src/main/java/emu/grasscutter/data/ResourceLoader.java (L131) in scene folder there is a typo name "BinOutPut" it should be "BinOutput" so scene file can't be found." - [Yuki#4985](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