Skip to content

Commit e6e7bd9

Browse files
Regular-Pokemon-Trainers-LeagueHisuianZoroarkmia-pi-gitLionyxmonsanto
authored
Feature/merge main (#3)
* Update HiZo Credits (smogon#2223) * Teambuilder: Provide Smogon Dex resources when building teams * Teambuilder: Fix target on Smogon links * Teambuilder: Don't try to load resources when they're already cached * Teambuilder: Cache failures for formats without resources * Modify CSS for accessibility * Rules: Add Korean translation (smogon#2221) Credits to igeu , xerneas9050 and dhwna for the translation, aegii for the formatting. * Remove a certain someone from credits Been spending some time processing the last decade of my life, including reading some old logs from the period where this user was banned, and I've decided that I have to make this commit to be able to move on. * Add package-lock.json * Remove unnecessary jabs at PO, which doesn't even exist anymore * One more * Improve dark mode checkboxes * Let's Go: Support itemless megas (smogon#2233) * Teambuilder: Show Restricted Legendaries for VGC/BSS Reg G (smogon#2239) * Add client support for Random Meta of the Decade * AFD Mode: Fix the ability to turn it off * Add support for adding badges in battle (smogon#2235) * Add support for adding badges in battle * oops Forgot these needed to be below the avatar per latest spec, not above * Move |badge| message handling to battle.ts * Update play.pokemonshowdown.com/src/battle.ts Co-authored-by: Karthik <32044378+Karthik99999@users.noreply.github.com> * Style button on ladder page, also add custom badges for ou/rands * change some badge filename stuff * more css stuff, final version --------- Co-authored-by: Karthik <32044378+Karthik99999@users.noreply.github.com> * Support rematching with custom rules (smogon#2234) * Teambuilder: Add EV optimization checker (smogon#2240) --------- Co-authored-by: pyuk-bot <msaimrkon@gmail.com> * Fix optimizer output when new spread has a 0 (smogon#2241) * Teambuilder: Generate user samples from boxes (smogon#2226) --------- Co-authored-by: Hisuian Zoroark <96159984+HisuianZoroark@users.noreply.github.com> Co-authored-by: Mia <49593536+mia-pi-git@users.noreply.github.com> Co-authored-by: Lionyx <choloux3@gmail.com> Co-authored-by: Christopher Monsanto <chris@monsan.to> Co-authored-by: Guangcong Luo <guangcongluo@gmail.com> Co-authored-by: Karthik <32044378+Karthik99999@users.noreply.github.com> Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com> Co-authored-by: Andrew Werner <HoeenCoder@users.noreply.github.com> Co-authored-by: pyuk-bot <msaimrkon@gmail.com> Co-authored-by: tofa <79044321+im-tofa@users.noreply.github.com>
1 parent da039e6 commit e6e7bd9

25 files changed

+5905
-514
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module.exports = {
2323
"BattleFormats": false, "BattleFormatsData": false, "BattleLearnsets": false, "BattleItems": false, "BattleMoveAnims": false, "BattleMovedex": false, "BattleNatures": false,
2424
"BattleOtherAnims": false, "BattlePokedex": false,"BattlePokemonSprites": false, "BattlePokemonSpritesBW": false, "BattleSearchCountIndex": false, "BattleSearchIndex": false, "BattleArticleTitles": false,
2525
"BattleSearchIndexOffset": false, "BattleSearchIndexType": false, "BattleStatIDs": false, "BattleStatNames": false, "BattleStatusAnims": false, "BattleStatuses": false, "BattleTeambuilderTable": false,
26-
"ModifiableValue": false, "BattleStatGuesser": false, "BattleText": true, "BattleTextAFD": false, "BattleTextNotAFD": false,
26+
"ModifiableValue": false, "BattleStatGuesser": false, "BattleStatOptimizer": false, "BattleText": true, "BattleTextAFD": false, "BattleTextNotAFD": false,
2727
"BattleTextParser": false,
2828

2929
// Generic global variables

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ node_modules/
22
.DS_Store
33
Thumbs.db
44
npm-debug.log
5-
package-lock.json
65
/config/
76
/vendor/
87
/caches/

.npmrc

-1
This file was deleted.

0 commit comments

Comments
 (0)