Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 15:22:16 +00:00
Code Issues Projects Releases Wiki Activity
561 Commits 7 Branches 22 Tags 133 MiB
f0d728b4e3
Commit Graph

561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iTruth
f0d728b4e3 Fix start.cmd can't find grasscutter when modify SERVER_JAR_NAME in start_config.cmd 2022-04-27 19:06:30 +02:00
Yazawazi
2ba16cf8b2 comment & mooncard 2022-04-27 08:42:48 -07:00
Yazawazi
32d322b0be onEnable & onDisable 2022-04-27 08:42:48 -07:00
Yazawazi
5b6ecc7219 Task Improvement 2022-04-27 08:42:48 -07:00
Melledy
ef2e159bb8 Merge pull request #297 from Kengxxiao/dev-feature-drop 
Implement simple monster drop
 2022-04-27 08:40:30 -07:00
xmplay
e1b6cbc87e fix readme again (bruh moment) 2022-04-27 08:38:53 -07:00
Kengxxiao
669e58d9f3 Merge branch 'development' into dev-feature-drop 2022-04-27 22:54:59 +08:00
Kengxxiao
ee3a0c32fc use better shop config structure 2022-04-27 07:35:31 -07:00
Kengxxiao
3e0ccbbbde implement npc shop 2022-04-27 07:35:31 -07:00
ayy lmao
0e3a80407e Added missing isGiftMail section to GetAllMailRsp 2022-04-27 15:11:57 +02:00
memetrollsXD
3c543e5c67 Update Drop.json 
data/ will appear in everyones files, so better change it to something more sane
 2022-04-27 14:44:36 +02:00
Kengxxiao
57e408012b reset drop table in reload command 2022-04-27 17:44:12 +08:00
Kengxxiao
8b614d8df8 implement simple drop system 2022-04-27 17:42:02 +08:00
Kengxxiao
9fc8cc1c17 Merge pull request #1 from Grasscutters/development 
merge
 2022-04-27 14:59:54 +08:00
Melledy
d1fc8c1faa Moved some files around 2022-04-26 21:27:35 -07:00
Melledy
1c36f0785b Renamed all references to a certain game 2022-04-26 21:27:35 -07:00
Melledy
6b8902bee2 Deprecate getServer() in DispatchServer, use getHttpServer() instead 2022-04-26 21:27:35 -07:00
Melledy
9afa32928a Cleanup https server creation in dispatch server 2022-04-26 21:27:35 -07:00
Melledy
cdb08195ee Fix cherry pick issues from drown packets 2022-04-26 21:27:35 -07:00
TheLostTree
a0ed13182c git doesnt like me 2022-04-26 21:27:35 -07:00
TheLostTree
687bc7ce87 drowning added 2022-04-26 21:27:35 -07:00
Melledy
d81895543f Call PacketItemAddHintNotify from addItem 2022-04-26 21:27:35 -07:00
Melledy
4420918f9c Rename handler 2022-04-26 21:27:35 -07:00
Melledy
7cf0e448cd World level updates without needing to restart 2022-04-26 21:27:35 -07:00
Melledy
9b7293272b Fix white screen after logging in 2022-04-26 21:27:35 -07:00
Melledy
0387992c42 Fix eclipse gradle support 2022-04-26 21:27:35 -07:00
Magix
ae00ab2dca Merge pull request #277 from Thomitics/patch-2 
Fix build uploading
 2022-04-26 21:46:32 -04:00
芊枫
9bdb96d154 Fix build uploading 2022-04-27 09:43:19 +08:00
Melledy
d44793359d Merge pull request #115 from 4Benj/dev-mail 
Implement the Mail System
 2022-04-26 18:42:30 -07:00
Benjamin Elsdon
cebc140228 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
Benjamin Elsdon
0917f516ea Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 08:41:10 +08:00
Benjamin Elsdon
ed3f88f013 Removed debug messages, readded protos, fixed gradle 2022-04-27 08:36:13 +08:00
Melledy
2935f0a6d3 Merge pull request #270 from Yazawazi/development 
Add `bless of moon` feature
 2022-04-26 16:39:57 -07:00
Benjamin Elsdon
b9f7c657ac Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-27 07:37:05 +08:00
Yazawazi
aa4b88d762 cron expression comments 2022-04-27 07:19:30 +08:00
Yazawazi
e8b34b6179 comments del 2022-04-27 07:14:02 +08:00
Yazawazi
ac796675f2 comments 2022-04-27 07:08:33 +08:00
Yazawazi
a12309710f Merge remote-tracking branch 'origin/development' into development 
# Conflicts:
#	src/main/java/emu/grasscutter/server/packet/send/PacketCardProductRewardNotify.java
 2022-04-27 07:02:38 +08:00
Yazawazi
420f544d68 DateHelper 2022-04-27 07:01:05 +08:00
Yazawazi
44f8d9d47b packet 2022-04-27 06:57:57 +08:00
Magix
782618cdca Merge pull request #254 from RealHeart/java-17 
Update README.md
 2022-04-26 18:46:16 -04:00
Magix
71524b0b66 Merge pull request #178 from BaiSugar/development 
Added command to get all items
 2022-04-26 18:45:08 -04:00
Yazawazi
aab6627203 del outerclass 2022-04-27 06:25:00 +08:00
Yazawazi
49854e4514 utils 2022-04-27 06:15:59 +08:00
Yazawazi
43470a384d date helper 2022-04-27 06:12:35 +08:00
Yazawazi
748e64a60c Moon Card 2022-04-27 06:04:21 +08:00
WetABQ
addfb5eb5d [BREAKING CHANGE] proto auto compiled by gradle (#226) 
* [BREAK] proto auto compiled by gradle

* [BREAK] move proto to submodule

* update gitmodules

* [BREAK] move proto to submodule

* move proto to submodule

* fix merge conflict

* fix github action after merging

* fix merge conflicts and del submodule

* upload the proto
 2022-04-26 14:44:30 -07:00
Magix
627a2f1ee8 Merge branch 'api' into development 2022-04-26 11:17:02 -04:00
KingRainbow44
444270fd9c Ignore gradle.properties 2022-04-26 11:14:39 -04:00
KingRainbow44
c9299d8444 Publish to Maven central 2022-04-26 11:14:05 -04:00