Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Ell 2021-03-21 17:38:21 +01:00
commit 73bb273804

View file

@ -47,5 +47,13 @@
"ManiacRobert": { "ManiacRobert": {
"tier": 2, "tier": 2,
"color": "800080" "color": "800080"
},
"Water_Moon": {
"tier": 2,
"color": "bb77ee"
},
"ticticboi": {
"tier": 2,
"color": "03fc4e"
} }
} }