Commit Graph

172 Commits

Author SHA1 Message Date
Tesutarin
d3c0d2e53c Update 2.7 second half banners 2022-06-21 02:43:21 -07:00
Kimi
8a1df19ed8 Traditional Chinese | Translation Patches (#1310)
* Traditional Chinese | Translation Patches

* Update zh-TW.json

* Update zh-TW.json

* Update zh-TW.json
2022-06-18 23:29:28 -07:00
Miralyn
f3544e98fc Fixed some mistakes in the ru json (#1312)
* Don't know what Dispatch means and can't really find it in Russian anywhere, not a specialist anyway so decided to not invent things.

* lost some symbols accidentally

* accidentally messed up some escape characters. translated a bit more
2022-06-18 23:28:07 -07:00
Miralyn
80c61466e3 Add Russian translation for server software (#1304)
* Don't know what Dispatch means and can't really find it in Russian anywhere, not a specialist anyway so decided to not invent things.

* lost some symbols accidentally
2022-06-18 15:02:21 +00:00
Melledy
30c7bb9443 Merge branch 'dev-world-scripts' of https://github.com/Grasscutters/Grasscutter into development 2022-06-17 23:35:45 -07:00
Yazawazi
aba4080b0e feat(ban): Implementing ban.
Rough code, not based on permission.
2022-06-17 19:42:42 -07:00
Tesutarin
cc4094549e Gacha Records: Support multiple languages 2022-06-15 23:44:57 -07:00
xlpmyxhdr
521deab4f2 Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at once
Fixed the issue that the Ancient Rock Dragon Lizard spawned too much at one time, so that one Ancient Rock Dragon Lizard was generated at a time, and the attributes were different
2022-06-14 18:08:43 -07:00
loulou310
57918d0344 Added fr-FR.json 2022-06-14 21:44:42 +02:00
Tesutarin
7c9db30bca KickCommand: Remove unnecessary subpermission 2022-06-14 01:14:33 -07:00
Tesutarin
c5b45358e7 Command: Add permissionTargeted or targetRequirement 2022-06-12 17:55:19 -07:00
Tesutarin
eb170bcb15 Language: Update translation 2022-06-10 21:20:50 -07:00
liizfq
934fb5873a add new command (unlimitenergy):toggle energyusage for each player (#1186)
* add new command (unlimitenergy):toggle energyusage for each player while  energyusage is ture in config.json

* Solve the problem of layout and naming errors

* make currentActiveTeam's Avatar full-energy while turn on the ule.

* Resolve language document errors

* add config_error message while player try to execute UnlimitEnergyCommand in GAME_OPTIONS.energyUsage == false
2022-06-04 19:14:52 -07:00
AZ
fa2ab59887 List game & server version when starting server (#1181)
* When the server starts, it now outputs the game and server version. Too dumb to not hardcode it - sorry!

* ...

* sorry i dropped my spaghetti, I'll help clean that

* Doing simple stuff: now without hardcoding!

* Restored Git hash functionality

* Fixed other languages and made the output more useful.

* Forgot this file lol
2022-06-04 02:41:18 -07:00
AZthemute
06546707e1 Fixed sendmessage command output.
Also clarified coop command in help command.
2022-06-03 19:11:47 -07:00
Tesutarin
66b642ef06 Language: Update translation 2022-06-03 10:16:45 -07:00
leonier-test
09580ef448 Ruin Guards/Hunters/Graders should drop Chaos Device series instead of Chaos Gear series. 2022-06-03 06:12:25 -07:00
leonier-test
0c5ff4377e Fix default Shop.json (for Mondstadt General Goods) 2022-06-03 06:12:04 -07:00
Paimon2022
4119f8b787 Add coordinate support for spawn command (monster only)
Now the spawn command is: spawn <entityID> [amount] [level(monster only)] <x> <y> <z>(monster only, optional)
The coordinate is optional
2022-06-03 03:19:59 -07:00
ImmuState
e1688c866f Make sure no player already has the reserved UID when creating and account. 2022-06-01 16:14:18 -07:00
Tesutarin
d10fe0cdd3 WeatherCommand: Make it clear 2022-06-01 06:27:07 -07:00
Tesutarin
4c42e00a8b Language: Update translation 2022-05-31 22:06:47 -07:00
tester233
6f5a290a3a Update translation 2022-05-31 02:41:43 -07:00
tester233
ba6a9fc798 Usage: Unified specification 2022-05-31 02:41:43 -07:00
Elapse
f5347cf98b fix banner title display 2022-05-30 21:22:42 -07:00
Elapse
550776a502 Update Banners.json 2022-05-30 20:15:11 -07:00
Melledy
184eec82b3 Limit spawn amount if too many entities are in the world
Can be controlled in the config with `sceneEntityLimit`
2022-05-30 20:06:25 -07:00
line-bear
3773f4df68 Add skill particle generation info for Yelan and Kuki Shinobu (#1097)
* Fix enter tower dungeons

* Add skill particle generation info for Yelan and Kuki Shinobu

* Update SkillParticleGeneration.json
2022-05-30 20:06:25 -07:00
zhaodice
a95002fd40 Hunting and deforestation support. (#1083)
* add drops for animals wild pig,fishes,foxes,birds

* append fox

* Deforestation Support

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* Deforestation support (remove prints)

implement drop woods when attacking tree

* add AutoRecycleHashMap

Map's KEY is automatic expire if key long time no use (query or modify from HashMap)

* use AutoRecycleHashMap in case of memory leak

* fix bug

* remove prints

* static AutoRecycleHashMap

* fix problems

* Delete AutoRecycleHashMap.java

* remove log

* fix build

* improve

* remove unnecessary information

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>

Co-authored-by: Albedo <105265570+arub3do@users.noreply.github.com>
2022-05-29 06:16:49 -07:00
tester233
830ac793fe Update translation 2022-05-28 21:34:38 -07:00
tester233
2a3d9fd06c CoopCommand: Fix usage 2022-05-28 21:34:38 -07:00
tester233
02e737e920 Complement usage 2022-05-28 16:01:21 -07:00
tester233
9af10859bb Update translation keys 2022-05-28 04:22:53 -07:00
ImmuState
cb3f3b92f5 Make sure energy drops are only processed for actual monsters. 2022-05-27 23:48:54 -07:00
logictc
6a9018e310 fix no melee attach and adjust skill particle amount 2022-05-26 15:26:47 -07:00
logictc
baef25680f change indentation to tab 2022-05-25 21:10:10 -07:00
logictc
95bc655882 implement skill particle generation 2022-05-25 21:10:10 -07:00
ImmuState
2a76e904ad Energy: Particle/Orb Drops from Monsters (#1054)
* Generate energy drops for monsters + make sure picking up particles honors their count.

* Use drop info from excels instead.

* Remove double newline.

* Remove commented code.
2022-05-24 21:43:04 -07:00
tester233
7f7e82e748 Update zh-CN.json 2022-05-24 14:19:24 -07:00
tester233
9b9e29b5d3 Fix usage & update zh-CN.json 2022-05-24 14:19:24 -07:00
ShiroSaki
2b799958d2 Refactor support for codex(aka archive) animal, weapon, reliquary 2022-05-23 02:46:50 -07:00
CCasusensa
6f798f838f Traditional Chinese | Translation Patch 2022-05-23 02:44:34 -07:00
tester233
2d2dc5d0a8 Update translation keys 2022-05-22 12:55:45 -07:00
Luke H-W
0ae3c3d7da Allow commands to target offline players (#1022)
* Add targetRequirement annotation for Command

* Added MTL lines for other langs

* Fix TargetRequirement enum scoping

* Adjust commands to targetRequirement system

* Add translation message sugar to prevent future messages from being translated for wrong player

* Temporarily disable offline targeting on /permission and /clear

* Preliminary README cleanup

* Readme commands cleanup

* Clean up command table in README, including column shuffle

Co-authored-by: AnimeGitB <AnimeGitB@bigblueball.in>
2022-05-22 01:02:11 -07:00
Kimi
fa0344d1f9 Traditional Chinese | Translation Patches 2022-05-22 01:01:56 -07:00
Benjamin Elsdon
5bd88d596b More Web Static Languages 2022-05-20 19:33:29 -07:00
Benjamin Elsdon
d1775b130f Attempt to fix untranslated login window 2022-05-20 05:52:15 -07:00
4Benj_
92f1a93ba2 Server Log Events (#996)
* Server Log Event

* LogEventAppender Encoder
2022-05-20 05:48:20 -07:00
ButterCookies
9125bacfce Set the maximum number of player on the server through the config.json (#1001)
* Show server status to three-party game launcher

* Set the maximum number of player on the server through the config.json

* modify the logical order and show the number of maxplayer to API /status/server

* Now even players who have token already cannot bypass the maxPlayer check
2022-05-20 05:47:47 -07:00
tester233
cf7c4832fe Remove outdated text & update zh-CN.json 2022-05-19 08:34:58 -07:00
7fb26c3843 Autogenerate document files 2022-05-18 23:19:13 -07:00
Melledy
a8f38ad995 Move chest rewards to new data format 2022-05-18 15:54:55 -07:00
2bllw8
e3ed396889 Add web documentation
- '/documentation': home page with all links
- '/documentation/handbook': html version of the gm handbook
- '/documentation/gachamapping': json document with the gacha mappings
2022-05-18 15:41:19 -07:00
linebear
827044b3da Fix this does not look like a tar archive error when extract log file 2022-05-18 15:38:26 -07:00
tester233
efe459e17f Fix punctuation & update zh-CN.json (#976)
* Fix punctuation & update zh-CN.json

* Fix error
2022-05-18 13:46:47 -07:00
tester233
b8cb6e108b Improve text & update zh-CN.json 2022-05-18 05:48:17 -07:00
AZthemute
e45ef7de51 General housekeeping and clarification of en-us.json file 2022-05-17 21:11:10 -07:00
tester233
b5632aa62d Fix usage & remove outdated text 2022-05-17 04:24:18 -07:00
4Benj_
f473e44611 "Autogenerate" data files with data fallbacks and moved keys folder into jar resources (#927)
* Autogenerate keys and data files

* Update gacha html files

Accidentally pushed with old html files

* Keys no longer copied. No more manually retrieving listing files. Recursive directory creation

Removed unused code from old GC as well.

* Moved somethings and better errors

* Fixed resources from loading twice

* Data files fallback
2022-05-17 03:00:52 -07:00
RDsatan
21478b0a33 fixed 2022-05-16 21:53:16 -07:00
RDsatan
34ea3089b6 Optimize the join and remove commands to team 2022-05-16 21:53:16 -07:00
lsCoding666
7a66f22827 fix join command and remove command bug and update docs (#904)
* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix

* fix(command):fix remove command a stupid bug.Loop delete element bug.

* fix(command):fix join command. When adding avatars, repeat avatars skip and non repeat avatars join.

* fix(language):fix join command remove command translate

* fix(ReadMe):update README.md join and remove command.
2022-05-14 23:27:23 -07:00
Hotaru
3a216bf1bb Move gacha files to separate directory and refactor file serving 2022-05-14 20:07:08 -07:00
tiantian520
5b3c05a9a0 Add a new command "nostamina" (#877)
* Add a new command " nostamina\

* Fix

* Fix 2

* Renamed some names.

* Update zh-CN.json

Fix an existing language expression error.
2022-05-14 16:06:48 -07:00
KingRainbow44
a2ff8c8470 Merge development into plugin-auth 2022-05-14 12:08:33 -04:00
lsCoding666
741e5749ad new command join and remove to force join or remove avatars into your current team (#549)
* feat:new command "join" and "remove" to force join or remove avatar in your current team

* fix:change MaxAvatarsInTeam from 9 to 4

* feat:update & merge branch.Translate fix
2022-05-14 06:28:02 -07:00
luluxiaoyu
3c654cf030 Update zh-TW.json 2022-05-13 22:12:14 -07:00
tester233
82698d5623 Improve text 2022-05-13 16:33:18 -07:00
KingRainbow44
840f4706b5 Refactor dispatch (now called HTTP) server (pt. 1) 2022-05-13 11:39:40 -04:00
Melledy
f4770cf20a Merge pull request #816 from Grasscutters/dev-quests
Implement quests
2022-05-13 05:36:30 -07:00
Kimi
891c70e5ea Traditional Chinese | Translation Patches 2022-05-13 05:35:21 -07:00
tester233
12c7c8f8c1 Improve text 2022-05-12 14:54:53 -07:00
tester233
4d9c2becb5 Improve text 2022-05-12 14:54:53 -07:00
tester233
28f4f73dbe Improve text 2022-05-12 14:54:53 -07:00
Melledy
5d4f245293 Merge branch 'development' into dev-quests 2022-05-11 12:39:28 -07:00
ImmuState
57c7f7a43b Add gacha details page. 2022-05-11 12:02:45 -07:00
mingjun97
570635ea02 Revise version format 2022-05-11 11:52:56 -07:00
mingjun97
895e2bc44a Display version info at console starting 2022-05-11 11:52:56 -07:00
tester233
9fc18151c9 Improve text 2022-05-11 11:51:24 -07:00
tester233
99de46e261 Improve text & remove extra punctuation 2022-05-11 11:51:24 -07:00
Benjamin Elsdon
c932f9c7e5 Add verifyUser to AuthenticationHandler 2022-05-11 11:51:11 -07:00
Melledy
51844b6535 Merge branch 'development' into dev-quests 2022-05-11 03:56:59 -07:00
Melledy
e9d7d5d5f2 Implement quests 2022-05-11 03:56:40 -07:00
Secretboy-SMR
e3fd2eaa17 Removed invalid code in getLanguageFileDescription,When the language is not discovered, it will use the built-in language fallback mechanism to fall back,At the same time, we also fix the issue that using language in the server does not save the settings of the server side locale 2022-05-11 03:11:10 -07:00
Magix
099e45b581 Merge pull request #688 from HotaruYS/patch-3
Improve logging pattern by including caller class name
2022-05-10 20:17:13 -04:00
tester233
f92e839ad1 Improve text 2022-05-10 06:36:19 -07:00
Secretboy
ecf028d0c6 add /language command (#780)
* 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

* add /language command,each account has their own Locate
2022-05-10 05:33:45 -07:00
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
Mateoust
c432ace5d8 Updating language files fixed the issue 648 677
fix issue 648 677
2022-05-09 04:18:12 -07:00
Shirakami Ling
056b5b80c8 Change the license type in zh-CN.json. 2022-05-08 16:02:09 -07:00
HotaruYS
9a0a15a462 Merge branch 'development' into patch-3 2022-05-08 15:34:17 +02:00
Akka
9fc4b916c8 Persist Tower Data && Set The Tower Schedule 2022-05-08 06:06:32 -07:00
Akka
9ad44f5c10 Monsters tide turn by turn && Ban User Skill && Lua functions 2022-05-08 06:06:32 -07:00
Michaellan
176f3e91f1 fill description 2022-05-08 05:51:13 -07:00
HotaruYS
beea95fdae Improve logging pattern by including caller class name 2022-05-08 14:30:48 +02:00
HotaruYS
7c35c51a6a Override server logging level with environment variable (#653)
Use `LOG_LEVEL` environment variable to override logging level for `emu.grasscutter` (which also contains all loggers under it). This might help with debugging various issues reported by users. Previously, the only way to override these levels would be to use `-Dlogback.configurationFile`
2022-05-08 03:48:06 -07:00
方块君
3a5503de72 Using annotation key translation 2022-05-08 01:47:26 -07:00
方块君
a46d58e5f6 Add command description multilingual 2022-05-08 01:47:26 -07:00