Commit Graph

1243 Commits

Author SHA1 Message Date
Kinesis
55b91ad150 fixed KillCharacter help command description typo case 2022-05-10 05:21:13 -07:00
tester233
c4078a505a Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
bd5e7c68fd Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
d7b3ee10ba Update zh-CN.json & fix typo 2022-05-10 03:10:08 -07:00
Bi Jiakai
bf3d6b3c64 Fixed account delete can not delete all related data (#767) 2022-05-10 03:09:47 -07:00
gentlespoon
32154c2a55 Temporarily set statue auto use to 1 and 100%. 2022-05-10 02:14:09 -07:00
gentlespoon
8074f47c6a Stamina will be set to full if Stamina is disabled. 2022-05-10 02:13:49 -07:00
Melledy
fd3e59f332 Remove previous fix for falling to death in godmode
This fix is more efficient
2022-05-10 01:50:04 -07:00
gentlespoon
5a6512c5cf No more fallen to death in god mode 2022-05-10 01:50:04 -07:00
Secretboy-SMR
cba16f2868 Fix the following issues:
1. HashMap non-thread-safe issus
2. Fix the same problem in pr621, but use a better implementation

Add the following functions:
1. There is now a language cache inside getLanguage to prepare for different languages corresponding to different time zones where the accounts in the server are located
2022-05-09 23:15:58 -07:00
FpguDhk
06be99fa15
Fix the decision statement of adding map marker. (#763)
* Fix the Chinese messy code problem.

* Fix the decision statement of adding map marker.
2022-05-09 23:15:17 -07:00
真心
e4df2813f1 Update build.gradle 2022-05-09 23:15:01 -07:00
hatsune-miku
f4f2cf6a96 Disable falling damage for godmode 2022-05-09 13:44:16 -07:00
Kinesis
e3daf684a5 fixed error KillCharacter description in the help command 2022-05-09 12:51:08 -07:00
ImmuState
5bf22ce8a2 Remove commented method and unused import. 2022-05-09 12:50:47 -07:00
ImmuState
b7ed76c79b Change ccount delete to delete all referenced items in the database. 2022-05-09 12:50:47 -07:00
Melledy
ba180d8bf5
Merge pull request #746 from Akka0/tower
fix the Monster spawn between stage challenges
2022-05-09 12:50:33 -07:00
筱傑
32232ff6f9 Fixed MissingFormatArgumentException (#727)
Format string is `"given_level": "Given %s with level %s %s times to %s"`
2022-05-09 12:50:23 -07:00
Akka
0764b6c2fa little fix 2022-05-10 00:14:50 +08:00
Akka
3e65ce63f5 Merge remote-tracking branch 'origin/development' into tower 2022-05-10 00:07:10 +08:00
Akka
a2e31a24dd
Merge pull request #9 from Grasscutters/development
Development
2022-05-10 00:06:08 +08:00
Akka
5a62a69c73 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
Mateoust
a63d87b0bc Update translation keys to fix issues 648 677
fix issues 648 677
2022-05-09 04:18:12 -07:00
Mateoust
e6cf27056f Updating language files fixed the issue 648 677
fix issue 648 677
2022-05-09 04:18:12 -07:00
AnimeGitB
c2d41ca0cf Fix /talent saving to level instead of id 2022-05-09 04:18:04 -07:00
gentlespoon
56635f2ecc Move "if Grasscutter.getConfig().OpenStamina" to the correct place. 2022-05-09 03:46:18 -07:00
Akka
ec7a66861a Fix #719 2022-05-09 02:28:41 -07:00
gentlespoon
1430ccb995 Exclude macOS junk in case anyone develops on mac. 2022-05-09 02:28:23 -07:00
gentlespoon
d332e77b76 Only handle motion notify for current entity. 2022-05-09 02:28:13 -07:00
Akka
3cf062c98c Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
Akka
bf8f4fba52 Fix #719 2022-05-09 17:01:08 +08:00
Melledy
e28d6a1441
Merge pull request #718 from Akka0/tower
Support Team Toggle in Tower & Refactor MonsterTide
2022-05-09 01:15:02 -07:00
AnimeGitB
993fe3131e Fix perm field order consistency on GiveCommand 2022-05-09 01:12:47 -07:00
AnimeGitB
d03f1ca5d1 Account permission wildcards 2022-05-09 01:12:47 -07:00
AnimeGitB
e23b72f298 Add permissionTargeted to applicable commands
Change target perm from target.perm to x.perm.others
2022-05-09 01:12:47 -07:00
Akka
e24ad0c732 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
Akka
1dd3c6d2e8
Merge pull request #8 from Grasscutters/development
Development
2022-05-09 15:42:12 +08:00
Akka
d00465125d Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Shirakami Ling
f0ff323b7b Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
ImmuState
8c7a46e8ef -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
ImmuState
2a12ed5694 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
ImmuState
e8e48600ae Fix invalid translation key. 2022-05-08 15:59:09 -07:00
ImmuState
14bf96e907 Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
Melledy
63eed41dd5 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
KingRainbow44
392ce26e32 Add warning for language fallback 2022-05-08 13:19:23 -07:00
KingRainbow44
1234a88c67 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
memetrollsXD
e56cd8385a Update com.google.code.gson 2.8.8 -> 2.9.0 2022-05-08 13:11:34 -07:00
memetrollsXD
bcd8d39084 Change LICENSE to GNU Affero
With these changes, commercial use is still allowed, but are required to disclose the source, changes, and copyright. Meaning that people won't be unknowingly ripped off, and would be paying knowing that it is an open-source project with possible changes.

tl;drLegal link: https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)
2022-05-08 13:09:22 -07:00
Akka
bb864bd28b Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower 2022-05-08 22:55:37 +08:00
HotaruYS
85821eb16b
Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00