summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-03-17 18:21:27 +0100
committerschneefux <schneefux+commit@schneefux.xyz>2017-03-17 18:21:27 +0100
commit0839d92be8b2277e3fde267dad71b9cf620d6b34 (patch)
tree52a57e0e543fc778ea624ac0b38bdb767ea04dd5
parent8ddee77640c63363e5cc9dc5ac27b02518fad656 (diff)
parent7cb25bd6866369df6421efb354fad58dd59535a0 (diff)
downloaddiscordbot-0839d92be8b2277e3fde267dad71b9cf620d6b34.tar.gz
discordbot-0839d92be8b2277e3fde267dad71b9cf620d6b34.zip
Merge branch 'release/1.2.0' into release/1.3.0
-rw-r--r--.gitmodules2
m---------joblib0
-rw-r--r--main.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 52948d0..47695ea 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "joblib"]
path = joblib
- url = https://github.com/vainglorygame/joblib
+ url = https://gitlab.com/vainglorygame/joblib.git
diff --git a/joblib b/joblib
-Subproject 7ced841aa44a7dd7bd2d3a68ceb989ef488ce44
+Subproject 542df395ce186ccc28d2c4122b7b12024ade8f4
diff --git a/main.py b/main.py
index e4783d1..cc5186b 100644
--- a/main.py
+++ b/main.py
@@ -134,7 +134,7 @@ async def vainsocial(name: str, region: str = None):
value=("%(wins)i wins / %(played)i games\n" +
"https://vainsocial.com/players/%(shard_id)s/%(name)s/?utm_source=discord&utm_medium=vainsocial") % data)
emb.add_field(name="Last match",
- value=("%(result)s %(mode)s as %(hero)s %(kills)i/%(deaths)i/%(assists)i (%(score_label)s %(score)s%%))\n" +
+ value=("%(result)s %(mode)s as %(hero)s %(kills)i/%(deaths)i/%(assists)i\n" +
"https://vainsocial.com/matches/%(match_api_id)s/?utm_source=discord&utm_medium=vainsocial") % data)
emb.set_footer(text="Vainsocial - Vainglory social stats service")