Commit Graph

1027 Commits

Author SHA1 Message Date
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
BaiSugar
fa9d703d44 Merge branch 'Grasscutters:development' into development 2022-04-27 20:31:40 +08:00
memetrollsXD
8d1c571c0c Update README.md 2022-04-27 13:20:57 +02:00
Yazawazi
897f529e62 comment & mooncard 2022-04-27 17:52:04 +08: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
memetrollsXD
d9441a2188 Update README.md 2022-04-27 11:37:50 +02:00
Magix
d19bc12761 Update Grasscutter.java
why do i have to fix stable
2022-04-27 11:33:36 +02:00
Yazawazi
2374c53ec3 onEnable & onDisable 2022-04-27 17:30:16 +08:00
Kengxxiao
9fc8cc1c17 Merge pull request #1 from Grasscutters/development
merge
2022-04-27 14:59:54 +08:00
Yazawazi
7789df6d4d Task Improvement 2022-04-27 13:10:50 +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
BaiSugar
6a5d97a3fa Update the command format of the usage (including source code) 2022-04-27 10:14:24 +08:00
BaiSugar
3b4454bc14 Update README.md 2022-04-27 10:02:41 +08: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
KingRainbow44
47d8fd3c43 Add get methods to the server hook 2022-04-26 21:24:37 -04:00
KingRainbow44
d4f9820e44 Added getting resources from the JAR 2022-04-26 21:24:09 -04:00
Benjamin Elsdon
cebc140228 GenshinPlayer fix (for two issues) and updated sendmail with Magix's suggestions 2022-04-27 09:03:26 +08:00
KingRainbow44
f3061a366e gave up, Pass class as argument to constructor 2022-04-26 20:54:56 -04:00
KingRainbow44
ae6a6abcd1 woo back to generics 2022-04-26 20:47:45 -04:00
KingRainbow44
749293350d Add dispatch to server hook & create instance 2022-04-26 20:47:28 -04: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
KingRainbow44
88bdaf155f Use a custom consumer instead of the built-in one 2022-04-26 20:28:13 -04:00
KingRainbow44
993255235e Fix handler invocation 2022-04-26 19:58:03 -04:00
KingRainbow44
0e514b9002 Fix handler creation 2022-04-26 19:57:32 -04: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
类C语言是一家
edc15cdebf update org.reflections
0.9.12->0.10.2
to avoid `[INFO] Unknown command` (#148)
2022-04-27 01:24:19 +02: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