Merge remote-tracking branch 'origin/cdn'

* origin/cdn: remove hottrick *automated* supporter update *automated* supporter update *automated* supporter update *automated* supporter update *automated* HY staff update *automated* supporter update *automated* supporter update updateCoaches.py
minj · Jan 3, 2020 · 4aaf6dd · 4aaf6dd
2 parents ab886a6 + d150fd8
commit 4aaf6dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/res/links.json b/res/links.json
@@ -178,13 +178,6 @@
 		"title": "Team Spirit Calculator",
 		"img": "resources/linkicons/Ht4u.png"
 	},
-	"hottrickkeeper": {
-		"keeperlink": {
-			"url": "http://www.hottrick.org/hattrick_keeper_tool.php"
-		},
-		"title": "Hottrick Keeper Tool",
-		"img": "http://www.hottrick.org/files/bluemarine-mod_favicon.ico"
-	},
 	"staminia": {
 		"playerlink": {
 			"url": "http://lizardopoli.altervista.org/staminia/"

diff --git a/res/staff/foxtrick.json b/res/staff/foxtrick.json
@@ -302,7 +302,7 @@
 		{
 			"duty": "translator",
 			"id": "11758667",
-			"name": "Alan_Smithee"
+			"name": "<Alan_Smithee>"
 		},
 		{
 			"duty": "supporter",
@@ -582,7 +582,7 @@
 		{
 			"duty": "translator",
 			"id": "13121281",
-			"name": "<Giovanni_Trapattoni>"
+			"name": "DrDrunkenstein"
 		},
 		{
 			"duty": "translator",
@@ -762,7 +762,7 @@
 		{
 			"duty": "translator",
 			"id": "2391052",
-			"name": "eyanez"
+			"name": "<eyanez>"
 		},
 		{
 			"duty": "supporter",
@@ -1112,7 +1112,7 @@
 		{
 			"duty": "translator",
 			"id": "524111",
-			"name": "piper_101"
+			"name": "<piper_101>"
 		},
 		{
 			"duty": "translator",
@@ -1462,7 +1462,7 @@
 		{
 			"duty": "developer",
 			"id": "8107197",
-			"name": "Greblys"
+			"name": "<Greblys>"
 		},
 		{
 			"duty": "supporter",
@@ -1707,7 +1707,7 @@
 		{
 			"duty": "translator",
 			"id": "9926153",
-			"name": "Ali_Mal_Tipo"
+			"name": "<Ali_Mal_Tipo>"
 		},
 		{
 			"duty": "translator",

diff --git a/res/staff/hy.json b/res/staff/hy.json
@@ -396,11 +396,6 @@
 			"name": "janisg",
 			"duty": "translator"
 		},
-		{
-			"id": "13305011",
-			"name": "LA-derberker",
-			"duty": "translator"
-		},
 		{
 			"id": "11191407",
 			"name": "linhtd",

diff --git a/res/staff/u20.json b/res/staff/u20.json
@@ -124,7 +124,7 @@
 		{ "LeagueId": 141, "TeamId": 3246, "TeamName": "U-20 Dawlat Qatar", "id": 12326398, "name": "LA-Jalal" },
 		{ "LeagueId": 142, "TeamId": 3248, "TeamName": "U-20 Tanzania", "id": 538232, "name": "Speakeasy" },
 		{ "LeagueId": 143, "TeamId": 3250, "TeamName": "U-20 Uganda", "id": 13505370, "name": "iceandfire" },
-		{ "LeagueId": 144, "TeamId": 3252, "TeamName": "U-20 Dhivehi Raajje", "id": 763947, "name": "Schumi-47" },
+		{ "LeagueId": 144, "TeamId": 3252, "TeamName": "U-20 Dhivehi Raajje", "id": 763947, "name": "GM-Schumi-47" },
 		{ "LeagueId": 145, "TeamId": 3261, "TeamName": "U-20 O'zbekiston", "id": 8255649, "name": "LA-Gruzik" },
 		{ "LeagueId": 146, "TeamId": 3255, "TeamName": "U-20 Cameroon", "id": 5842822, "name": "coachjojo" },
 		{ "LeagueId": 147, "TeamId": 3257, "TeamName": "U-20 Cuba", "id": 12592087, "name": "Salva_ou" },