Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-22 11:54:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,732 Commits 7 Branches 22 Tags
6d65b7151208d1bba97a690a8078027812b97e0c
Commit Graph

197 Commits

Author SHA1 Message Date
Akka
9bafc2c5d5 Implement server announcement (#1420) 
* implement server announcement

* Update src/main/java/emu/grasscutter/command/commands/AnnounceCommand.java

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>

* Added arg numbers check

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
 2022-07-02 06:43:22 -07:00
Magix
bd40ecee2a Add the es-ES language 
By: `Blue#7596` or `<@470933959929364481>`
 2022-07-01 18:17:23 -04:00
zhaodice
f90b65120a Fix no static gadget in the map,example: no tree but a fruit in the air (#1415) 
* fixGadget

* fixGadget

* add gadgetObject

* fix bug
 2022-07-01 11:41:53 -07:00
loulou310
b703201598 Update translation 2022-07-01 23:58:59 +09:30
Tesutarin
8267d796db Update translation 2022-06-30 00:54:57 +09:30
Akka
12146ff09c implement the music game 2022-06-29 05:23:02 -07:00
Akka
977f1ca2ea implement the activity system 2022-06-29 05:23:02 -07:00
zhaodice
2462da2ede Big World Resources Collection Implement (#1368) 
* init

* init

* init

* revoke

* fix error

* mining support

* mining support

* Roks endurance support

* Roks endurance support

* Timed refresh

* upgrade resource data

* Timed refresh support

* remove null gadget

* Coordination

* full synchronized

* oh no, my math teacher will hit me!

* synchronized onInteract

* remove break;

* supply re-spawn time , thanks to @wl23333

* Clean up and integrate collection spawns into SpawnDataEntries

Co-authored-by: Melledy <52122272+Melledy@users.noreply.github.com>
 2022-06-29 04:53:50 -07:00
KingRainbow44
f5bc750150 Clean up the server's logger. 2022-06-26 13:03:10 -04:00
KingRainbow44
19d81463bc Merge remote-tracking branch 'origin/development' into development 2022-06-26 12:33:03 -04:00
KingRainbow44
71b118dd9f Add a start and finish message to resource loading 2022-06-26 12:31:09 -04:00
xingluo233
b5fd8c1acd Update TowerSchedule.json 2022-06-26 02:34:24 -07:00
AnimeGitB
9425f672e0 Remove BPLevel, GodMode, NoStamina, SetWorldLevel, UnlimitEnergy, UnlockTower commands 2022-06-25 22:19:29 -07:00
AnimeGitB
baafb4104c Remove GiveAll, GiveArt, GiveChar commands 2022-06-25 22:19:29 -07:00
AnimeGitB
6fd1ce813c Remove Drop, ChangeScene, Restart, Broadcast commands 2022-06-25 22:19:29 -07:00
AnimeGitB
a3b4a11863 Add permission to BanCommand, rework its targeting 2022-06-25 02:12:33 -07:00
Tesutarin
52c1d2f540 Update translation 2022-06-23 21:23:27 -07:00
Luke H-W
f04035da34 Merge branch 'development' into Weather 2022-06-24 00:47:14 +09:30
@Roly
74151c204c Fix chest types 2022-06-23 05:38:38 -07:00
AnimeGitB
b2e620553a Tweak messages 2022-06-23 02:38:04 +09:30
Luke H-W
aa835ecac7 Update src/main/resources/languages/en-US.json 
Co-authored-by: Tesutarin <105267106+Tesutarin@users.noreply.github.com>
 2022-06-22 23:41:14 +09:30
AnimeGitB
371acb9ba5 Deduplicate some translation keys 2022-06-22 23:20:16 +09:30
AnimeGitB
dcd3c696ea Add default Climates per weather 2022-06-22 22:41:07 +09:30
GanyusLeftHorn
63b6b805cc Bring back dungeon drops. 2022-06-21 19:49:46 -07:00
loulou310
c171b5904e French translation for ban and unban and typos fix (#1337) 
* Fixed french readme's typos, and the Discord server link

* Translated ban and unban commands for French
 2022-06-21 07:14:47 -07:00
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