1
0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2025-10-27 18:00:03 +00:00

Merged master into 1.0.1

This commit is contained in:
2016-02-27 01:03:19 +01:00
19 changed files with 18 additions and 16 deletions

View File

@@ -1863,7 +1863,7 @@
};
slugSpecies = slugify(this.get('species'));
slugForme = slugify(this.get('forme'));
return "//pokebattle.com/dex/pokemon/" + slugSpecies + "/" + slugForme;
return "//wiki.p-insurgence.com/" + slugSpecies;
};
Pokemon.prototype.getIllu = function() {

View File

@@ -1863,7 +1863,7 @@
};
slugSpecies = slugify(this.get('species'));
slugForme = slugify(this.get('forme'));
return "//pokebattle.com/dex/pokemon/" + slugSpecies + "/" + slugForme;
return "//wiki.p-insurgence.com/" + slugSpecies;
};
Pokemon.prototype.getIllu = function() {