-
Notifications
You must be signed in to change notification settings - Fork 114
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add pokemon showcase #850
Merged
Merged
add pokemon showcase #850
Changes from 61 commits
Commits
Show all changes
79 commits
Select commit
Hold shift + click to select a range
7958c52
Update package.json
ReuschelCGN 33ddd61
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN bddec9a
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN a85b683
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 9e6e707
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN e299b9a
Update de.json
ReuschelCGN 3ae5340
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 888a57c
Update default.json
ReuschelCGN 383fc43
Update default.json
ReuschelCGN 0a0aaab
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 2074605
Update invasion.js
ReuschelCGN 1096439
Update invasion.js
ReuschelCGN b4fffc6
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 74044b1
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 763ef50
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN bf8b78f
Update de.json
ReuschelCGN 75b2a98
Update testdata.json
ReuschelCGN 8f2e099
Update testdata.json
ReuschelCGN 751dda9
Update testdata.json
ReuschelCGN c3a9298
Update mon.txt
ReuschelCGN 875577c
Update dts_all.json
ReuschelCGN e2396f8
Update testdata.json
ReuschelCGN 2074c6d
Update de.json
ReuschelCGN 6b6e58a
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN b4a7fa5
Update apiTrackingEgg.js
ReuschelCGN 953dab3
Update apiTrackingRaid.js
ReuschelCGN 8496679
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 45e00f9
Update util.json
ReuschelCGN 9b5b37c
Update de.json
ReuschelCGN 0bb9e23
Update apiTrackingLure.js
ReuschelCGN dc36cf3
Update script.js
ReuschelCGN 014f056
Update lure.js
ReuschelCGN 61edf1e
Update testdata.json
ReuschelCGN 44f5f4e
Update de.json
ReuschelCGN 46d08fc
Update de.json
ReuschelCGN 03960b5
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 76375bc
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 923b1d3
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN b174369
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 799bdfa
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 6aab040
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 4183aa1
Update pokestop.js
ReuschelCGN 7ba5035
Update pokestop.js
ReuschelCGN 4fdbd35
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 7ea827f
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 6450701
Update package.json
ReuschelCGN f4538be
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 2aeda7b
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN d459af9
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 4866fdf
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN ec50a5b
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN c56a1c4
Update de.json
ReuschelCGN d191bc2
Update de.json
ReuschelCGN 679ba39
Update de.json
ReuschelCGN 968f8eb
Update de.json
ReuschelCGN 84b02e5
Update util.json
ReuschelCGN ec80aa3
Update de.json
ReuschelCGN 3573e99
Update de.json
ReuschelCGN eec16f5
Update pokestop.js
ReuschelCGN ccf6723
Update pokestop.js
ReuschelCGN c9a9317
Update pokestop.js
ReuschelCGN 00b5978
Update de.json
ReuschelCGN 5567718
Update util.json
ReuschelCGN 58591fc
Update util.json
ReuschelCGN 038f4a0
Update invasion.js
ReuschelCGN be27286
Add files via upload
ReuschelCGN cb8a132
Update invasion.js
ReuschelCGN 57ff508
Add files via upload
ReuschelCGN 12b4493
Update info.js
ReuschelCGN eb82968
Delete invasion.js
ReuschelCGN 6ac4fad
Add files via upload
ReuschelCGN bff8fae
Update pokestop.js
ReuschelCGN bc21476
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 9c452b7
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN df3f2b3
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN 67939c4
Update pokestop.js
ReuschelCGN 123e297
Update Telegram.js
ReuschelCGN 377aee4
Update discordWorker.js
ReuschelCGN bfc3de4
Merge branch 'KartulUdus:develop' into develop
ReuschelCGN File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -936,6 +936,6 @@ | |
"pokestopEvent": { | ||
"7": "Gold-Stop", | ||
"8": "Kecleon", | ||
"9": "Pokemon-Contest" | ||
"9": "Showcase" | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These should be in util.json - see plenty of other examples.
Maybe the color and an emoji reference should be there?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
like this?
im actually working on it
"3": {
"name": "Instinct",
"color": "FFDE00",
"emoji": "team-instinct"
},
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, exactly