Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-23 08:11:12 +00:00
Code Issues Projects Releases Wiki Activity
578 Commits 7 Branches 22 Tags 133 MiB
0cbfcddae4
Commit Graph

578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BaiSugar
f3d561cd06 Revert "Corrected format" 
This reverts commit 60319ee9eb.
 2022-04-24 22:42:44 +08:00
BaiSugar
60319ee9eb Corrected format 2022-04-24 22:38:53 +08:00
Melledy
a8ed99c94f Merge pull request #182 from RimuruChan/development 
Fix a spelling mistake
 2022-04-24 07:22:27 -07:00
Melledy
dfbf67c81e Merge pull request #181 from lunaticwhat/development 
corrected some information for dev branch
 2022-04-24 07:22:09 -07:00
Melledy
929bb38f2e Merge pull request #180 from Yazawazi/development 
Fix the property prompt issue in fetter system
 2022-04-24 07:21:34 -07:00
Melledy
edd0bccf5a Merge pull request #167 from memetrollsXD/development 
Try to fix "No SSL cert found bind exception"
 2022-04-24 07:16:05 -07:00
Melledy
bce8fb00e5 Merge pull request #190 from RimuruChan/patch-1 
Update build.gradle
 2022-04-24 07:15:03 -07:00
BaiSugar
0796957751 Added command to get all items 2022-04-24 21:52:50 +08:00
雪碧
46d89f5f5c Update build.gradle 
fix three cve.
 2022-04-24 21:32:48 +08:00
FahimFBA
4c7051bb6a Update CODE_OF_CONDUCT.md 2022-04-24 19:24:23 +06:00
FahimFBA
a65cc94e24 Update CODE_OF_CONDUCT.md 
Changed the mail address to the Discord server
 2022-04-24 19:23:23 +06:00
Benjamin Elsdon
94a75cf903 THE MAILBOX ACTUALLY WORKS CORRECTLY NOW 2022-04-24 19:06:52 +08:00
FahimFBA
5a508bce55 Update CODE_OF_CONDUCT.md 
Added the email address. Please change the mail address as you see fit.
 2022-04-24 16:38:30 +06:00
FahimFBA
fc23d3e0bd Create CODE_OF_CONDUCT.md 2022-04-24 16:35:53 +06:00
memetrollsXD
8066b16417 Add .vscode to gitignore and use @fumbling644o's implementation 2022-04-24 12:24:41 +02:00
Benjamin Elsdon
f556bff333 Java-16 compatiable mail system (whoops) 2022-04-24 18:17:08 +08:00
Benjamin Elsdon
c25e809f5c Merge remote-tracking branch 'upstream/development' into dev-mail 2022-04-24 18:01:32 +08:00
RimuruChan
96c0210707 Fix a spelling mistake 2022-04-24 15:35:22 +08:00
lunaticwhat
26b68479e7 corrected some information for dev branch 2022-04-24 14:34:29 +07:00
Yazawazi
23f0406b57 command fix too 2022-04-24 15:10:25 +08:00
Yazawazi
5c0c4fe67e Merge branch 'Grasscutters:development' into development 2022-04-24 15:03:58 +08:00
Melledy
b6d8dd0db4 Merge pull request #175 from omg-xtao/suicide 
GodMode command supports playerId
 2022-04-24 00:03:21 -07:00
Yazawazi
8d8866aa63 Fix fetter system 2022-04-24 15:02:31 +08:00
Melledy
f6d717ab7f Merge pull request #173 from Yazawazi/development 
Add player level reward
 2022-04-24 00:00:36 -07:00
BaiSugar
02ef9d84c7 Added command to get all items 2022-04-24 14:01:03 +08:00
Yazawazi
56a1ab64ab Player Level Reward Update Notify Support! 2022-04-24 13:22:26 +08:00
Magix
795a4cde3c Merge pull request #163 from memetrollsXD/patch-1 
Propose a Contributing COC
 2022-04-24 00:57:59 -04:00
xtaodada
2f5ae6c784 GodMode command supports playerId 2022-04-24 11:40:10 +08:00
Yazawazi
b2840b1740 Player level reward 2022-04-24 11:25:13 +08:00
memetrollsXD
79d646d358 Remove last catch and init another variable as placeholder 2022-04-24 04:50:22 +02:00
memetrollsXD
bed3181252 Forgot the toCharArray 2022-04-24 04:41:06 +02:00
memetrollsXD
2045dd2832 Notify user that new pw was used 2022-04-24 04:36:11 +02:00
memetrollsXD
8f81195336 Try to fix "No SSL cert found bind exception" 2022-04-24 04:34:17 +02:00
Melledy
f536da0c77 Merge pull request #166 from lunaticwhat/development 
gitignore'd protos
 2022-04-23 17:07:25 -07:00
lunaticwhat
031be2e3d1 gitignore'd protos 2022-04-24 06:00:27 +07:00
Melledy
81ee9a00a2 Merge pull request #164 from miyucchi/development 
Fix counter (Create a new account if exists issue)
 2022-04-23 15:26:14 -07:00
Melledy
7a4de2f0d6 Merge pull request #128 from memetrollsXD/development 
Use count for level for equips (dev branch)
 2022-04-23 15:15:22 -07:00
Melledy
dac3cdbe17 Merge pull request #124 from Yazawazi/development 
Character fetter system
 2022-04-23 15:15:09 -07:00
Miyucchi
7792c5c73f Fix counter 2022-04-24 00:10:26 +02:00
memetrollsXD
11df62969c Fix another weird line break 2022-04-24 00:06:56 +02:00
memetrollsXD
1ebba3af38 Fix "weird spacing" 2022-04-24 00:05:40 +02:00
Yazawazi
9e523da18e tp with relative coordinates 2022-04-24 05:20:59 +08:00
Yazawazi
0c4d975409 Merge branch 'Grasscutters:development' into development 2022-04-24 05:03:55 +08:00
memetrollsXD
ebecbe8733 Propose a Contributing COC 2022-04-23 22:44:52 +02:00
memetrollsXD
fd1890b072 Merge branch 'Grasscutters:development' into development 2022-04-23 22:37:48 +02:00
memetrollsXD
6dae4d43fe Add level parameter to README 2022-04-23 22:33:52 +02:00
Magix
cf84877937 Merge pull request #138 from WangYneos/stable 
make mitmproxy ignore non Genshin hosts
 2022-04-23 16:30:40 -04:00
Magix
002edb8474 Merge pull request #137 from fumbling644o/development-actions 
Workflow: Use Ubuntu and trigger on PR actions
 2022-04-23 16:29:37 -04:00
Magix
a945c2188f Merge pull request #109 from xmplay/xmplay-readme 
fix typos and grammar in README.md
 2022-04-23 16:28:31 -04:00
Magix
262a049bd7 Merge branch 'development' into xmplay-readme 2022-04-23 16:28:13 -04:00