Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-28 08:30:30 +00:00
Code Issues Projects Releases Wiki Activity
1,992 Commits 7 Branches 22 Tags 133 MiB
2a5abc1dcb
Commit Graph

1992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tester233
70cfe3e42a Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
ad1d45fa90 Update zh-CN.json 2022-05-10 03:10:08 -07:00
tester233
7efbdbf1ed Update zh-CN.json & fix typo 2022-05-10 03:10:08 -07:00
Bi Jiakai
f26fe213a2 Fixed account delete can not delete all related data (#767) 2022-05-10 03:09:47 -07:00
gentlespoon
fb3c3b71c8 Temporarily set statue auto use to 1 and 100%. 2022-05-10 02:14:09 -07:00
gentlespoon
0ea0eab6b6 Stamina will be set to full if Stamina is disabled. 2022-05-10 02:13:49 -07:00
Melledy
c424d15b32 Remove previous fix for falling to death in godmode 
This fix is more efficient
 2022-05-10 01:50:04 -07:00
gentlespoon
a601e13d80 No more fallen to death in god mode 2022-05-10 01:50:04 -07:00
Secretboy-SMR
5a37acde2b 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
d179b5c7dc 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
真心
01a33906d3 Update build.gradle 2022-05-09 23:15:01 -07:00
hatsune-miku
f5509d1e7d Disable falling damage for godmode 2022-05-09 13:44:16 -07:00
Kinesis
c2230485c1 fixed error KillCharacter description in the help command 2022-05-09 12:51:08 -07:00
ImmuState
1c8207500c Remove commented method and unused import. 2022-05-09 12:50:47 -07:00
ImmuState
19e798a28b Change ccount delete to delete all referenced items in the database. 2022-05-09 12:50:47 -07:00
Melledy
85f5a753e1 Merge pull request #746 from Akka0/tower 
fix the Monster spawn between stage challenges
 2022-05-09 12:50:33 -07:00
筱傑
bdc9e483ae 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
66b17cad26 little fix 2022-05-10 00:14:50 +08:00
Akka
2e69a4d8f7 Merge remote-tracking branch 'origin/development' into tower 2022-05-10 00:07:10 +08:00
Akka
c2a7d6076b Merge pull request #9 from Grasscutters/development 
Development
 2022-05-10 00:06:08 +08:00
Akka
faa3cde575 fix the Monster spawn between stage challenges 2022-05-10 00:05:01 +08:00
Mateoust
9a7d78e0b7 Update translation keys to fix issues 648 677 
fix issues 648 677
 2022-05-09 04:18:12 -07:00
Mateoust
c432ace5d8 Updating language files fixed the issue 648 677 
fix issue 648 677
 2022-05-09 04:18:12 -07:00
AnimeGitB
63efef8d05 Fix /talent saving to level instead of id 2022-05-09 04:18:04 -07:00
gentlespoon
5d917f185f Move "if Grasscutter.getConfig().OpenStamina" to the correct place. 2022-05-09 03:46:18 -07:00
Akka
eb2b23928b Fix #719 2022-05-09 02:28:41 -07:00
gentlespoon
6197ab21cd Exclude macOS junk in case anyone develops on mac. 2022-05-09 02:28:23 -07:00
gentlespoon
ccdc3d1214 Only handle motion notify for current entity. 2022-05-09 02:28:13 -07:00
Akka
45b45c4beb Merge remote-tracking branch 'fork/tower' into tower 2022-05-09 17:01:26 +08:00
Akka
722e710c7b Fix #719 2022-05-09 17:01:08 +08:00
Melledy
f0aa8c2c53 Merge pull request #718 from Akka0/tower 
Support Team Toggle in Tower & Refactor MonsterTide
 2022-05-09 01:15:02 -07:00
AnimeGitB
713b2698d0 Fix perm field order consistency on GiveCommand 2022-05-09 01:12:47 -07:00
AnimeGitB
f08a89711c Account permission wildcards 2022-05-09 01:12:47 -07:00
AnimeGitB
80db118f72 Add permissionTargeted to applicable commands 
Change target perm from target.perm to x.perm.others
 2022-05-09 01:12:47 -07:00
Akka
47ea466054 Merge remote-tracking branch 'origin/development' into tower 2022-05-09 15:43:52 +08:00
Akka
0bfa1fa0e9 Merge pull request #8 from Grasscutters/development 
Development
 2022-05-09 15:42:12 +08:00
Akka
65c93a747c Support Team Toggle in Tower & Refactor MonsterTide 2022-05-09 15:39:49 +08:00
Shirakami Ling
056b5b80c8 Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
ImmuState
9869e4368d -Make the _tier suffix optional. 2022-05-08 15:59:09 -07:00
ImmuState
935bb4b523 Fix incorrect @Command annotation. 2022-05-08 15:59:09 -07:00
ImmuState
72e8a976ea Fix invalid translation key. 2022-05-08 15:59:09 -07:00
ImmuState
5f8011f0ec Added to ability to specify main and substats for /giveart via names instead of IDs. 2022-05-08 15:59:09 -07:00
Melledy
06f531fe18 Merge branch 'stable' into development 2022-05-08 15:52:16 -07:00
KingRainbow44
d43f431506 Add warning for language fallback 2022-05-08 13:19:23 -07:00
KingRainbow44
137ea1e294 Fallback to the fallback fallback 2022-05-08 13:19:23 -07:00
memetrollsXD
09801a1845 Update com.google.code.gson 2.8.8 -> 2.9.0 2022-05-08 13:11:34 -07:00
memetrollsXD
3c20f2b032 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
ccdce68434 Merge branch 'tower' of https://github.com/Akka0/Grasscutter into tower 2022-05-08 22:55:37 +08:00
HotaruYS
9a0a15a462 Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Yazawazi
5d1f49579b feature(task): Implement pause, resume and cancel 
Use as `pauseTask(taskName)`. They return boolean values to tell the developer if a timed task can be paused/resumed/cancelled properly.
A little bit of testing shows that pausing and then resuming may execute the task multiple times.
 2022-05-08 06:28:13 -07:00