Skip to content

Commit ee6b9aa

Browse files
authored
Merge pull request #39 from kagof/release/1.4.0
Release/1.4.0
2 parents 48d5c7e + 3a260f7 commit ee6b9aa

File tree

109 files changed

+180
-36
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+180
-36
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ Preferably you should be using [signed commits](https://help.github.com/en/artic
7171
* if adding a new Pokémon:
7272
* please maintain numerical ordering in the [Readme](README.md), [plugin.xml](src/main/resources/META-INF/plugin.xml), and [Pokemon.java](src/main/java/com/kagof/intellij/plugins/pokeprogress/Pokemon.java)
7373
* [editSprite.sh](editSprite.sh) can be used to generate the required gifs from existing png images
74-
* [DocumentGenerator.java](src/test/java/com/kagof/intellij/plugins/pokeprogress/DocumentationGenerator.java) can be used to generate the new lines in plugin.xml and README.md
74+
* [DocumentGenerator.java](src/test/java/com/kagof/intellij/plugins/pokeprogress/DocumentationGenerator.java) can be used to generate the new lines in [`description.html`](./description.html) and [`README.md`](README.md)
7575
* [TestProgressBar.java](src/test/java/com/kagof/intellij/plugins/pokeprogress/TestProgressBar.java)) is very useful when tweaking sprite positioning & sizing (Thanks to @Paola351 for the initial implementation of this!)

README.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ This is [a plugin](https://plugins.jetbrains.com/plugin/15090-pokemon-progress/v
6666

6767
### Generation III
6868

69+
* ![Treecko (#252)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/treecko.gif) Treecko (#252) ![Treecko (#252)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/treecko_r.gif)
70+
* ![Sceptile (#254)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/sceptile.gif) Sceptile (#254) ![Sceptile (#254)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/sceptile_r.gif)
71+
* ![Torchic (#255)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/torchic.gif) Torchic (#255) ![Torchic (#255)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/torchic_r.gif)
72+
* ![Blaziken (#257)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/blaziken.gif) Blaziken (#257) ![Blaziken (#257)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/blaziken_r.gif)
73+
* ![Mudkip (#258)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/mudkip.gif) Mudkip (#258) ![Mudkip (#258)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/mudkip_r.gif)
74+
* ![Swampert (#260)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/swampert.gif) Swampert (#260) ![Swampert (#260)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/swampert_r.gif)
6975
* ![Wailmer (#320)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailmer.gif) Wailmer (#320) ![Wailmer (#320)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailmer_r.gif)
7076
* ![Wailord (#321)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailord.gif) Wailord (#321) ![Wailord (#321)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/wailord_r.gif)
7177
* ![Kyogre (#382)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/kyogre.gif) Kyogre (#382) ![Kyogre (#382)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/kyogre_r.gif)
@@ -85,12 +91,33 @@ This is [a plugin](https://plugins.jetbrains.com/plugin/15090-pokemon-progress/v
8591
* ![Leafeon (#470)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/leafeon.gif) Leafeon (#470) ![Leafeon (#470)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/leafeon_r.gif)
8692
* ![Glaceon (#471)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/glaceon.gif) Glaceon (#471) ![Glaceon (#471)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/glaceon_r.gif)
8793

94+
### Generation V
95+
96+
* ![Snivy (#495)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/snivy.gif) Snivy (#495) ![Snivy (#495)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/snivy_r.gif)
97+
* ![Serperior (#497)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/serperior.gif) Serperior (#497) ![Serperior (#497)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/serperior_r.gif)
98+
* ![Tepig (#498)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/tepig.gif) Tepig (#498) ![Tepig (#498)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/tepig_r.gif)
99+
* ![Emboar (#500)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/emboar.gif) Emboar (#500) ![Emboar (#500)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/emboar_r.gif)
100+
* ![Oshawott (#501)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/oshawott.gif) Oshawott (#501) ![Oshawott (#501)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/oshawott_r.gif)
101+
* ![Samurott (#503)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/samurott.gif) Samurott (#503) ![Samurott (#503)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/samurott_r.gif)
102+
88103
### Generation VI
89104

105+
* ![Chespin (#650)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/chespin.gif) Chespin (#650) ![Chespin (#650)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/chespin_r.gif)
106+
* ![Chesnaught (#652)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/chesnaught.gif) Chesnaught (#652) ![Chesnaught (#652)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/chesnaught_r.gif)
107+
* ![Fennekin (#653)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/fennekin.gif) Fennekin (#653) ![Fennekin (#653)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/fennekin_r.gif)
108+
* ![Delphox (#655)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/delphox.gif) Delphox (#655) ![Delphox (#655)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/delphox_r.gif)
109+
* ![Froakie (#656)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/froakie.gif) Froakie (#656) ![Froakie (#656)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/froakie_r.gif)
110+
* ![Greninja (#658)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/greninja.gif) Greninja (#658) ![Greninja (#658)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/greninja_r.gif)
90111
* ![Sylveon (#700)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/sylveon.gif) Sylveon (#700) ![Sylveon (#700)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/sylveon_r.gif)
91112

92113
### Generation VII
93114

115+
* ![Rowlet (#722)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/rowlet.gif) Rowlet (#722) ![Rowlet (#722)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/rowlet_r.gif)
116+
* ![Decidueye (#724)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/decidueye.gif) Decidueye (#724) ![Decidueye (#724)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/decidueye_r.gif)
117+
* ![Litten (#725)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/litten.gif) Litten (#725) ![Litten (#725)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/litten_r.gif)
118+
* ![Incineroar (#727)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/incineroar.gif) Incineroar (#727) ![Incineroar (#727)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/incineroar_r.gif)
119+
* ![Popplio (#728)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/popplio.gif) Popplio (#728) ![Popplio (#728)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/popplio_r.gif)
120+
* ![Primarina (#730)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/primarina.gif) Primarina (#730) ![Primarina (#730)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/primarina_r.gif)
94121
* ![Mimikyu (#778)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/mimikyu.gif) Mimikyu (#778) ![Mimikyu (#778)](src/main/resources/com/kagof/intellij/plugins/pokeprogress/sprites/mimikyu_r.gif)
95122

96123
### Generation VIII
@@ -116,8 +143,16 @@ Contributions are very welcome on this project! Please see our [contributing gui
116143
* [Pokencyclopedia SpriteDex - Heart Gold & Soul Silver](https://www.pokencyclopedia.info/en/index.php?id=sprites/overworlds/o-r_hgss)
117144
* All Gen I-IV sprites unless otherwise noted
118145
* MissingNo.
146+
* [Kyle-Dove on DeviantArt](https://www.deviantart.com/kyle-dove/gallery)
147+
* Snivy, Tepig, Oshawott
148+
* [cSc-A7X on DeviantArt](https://www.deviantart.com/csc-a7x/gallery)
149+
* Serperior, Emboar, Samurott
150+
* [princess-phoenix on DeviantArt](https://www.deviantart.com/princess-phoenix/art/Gen-6-Kalos-Pokemon-Overworld-Sprites-525954409)
151+
* All Gen VI sprites unless otherwise noted
119152
* [JuJoAura on DeviantArt](https://www.deviantart.com/jujoaura/art/Sylveon-Full-Sprite-379989482)
120153
* Sylveon
154+
* [Princess-Phoenix, Larryturbo, Kiddkatt, Zender1752, SageDeoxys, curated by Larryturbo](https://www.deviantart.com/larryturbo/art/Gen-7-Alola-Overworld-Sprites-805455576)
155+
* All Gen VII sprites unless otherwise noted
121156
* [Bulbagarden Archives](https://archives.bulbagarden.net)
122157
* Mimikyu (first frame)
123158
* [SageDeoxys](https://www.pokecommunity.com/showthread.php?t=429414)

build.gradle.kts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
group = "com.kagof"
7-
version = "1.3.1"
7+
version = "1.4.0"
88

99
repositories {
1010
mavenCentral()
@@ -30,4 +30,9 @@ tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml
3030
if (it.exists() && it.isFile && it.canRead()) changeNotes(it.readText())
3131
else throw IllegalStateException("unable to read changenotes.html")
3232
}
33+
File("description.html").let {
34+
if (it.exists() && it.isFile && it.canRead()) pluginDescription(it.readText())
35+
else throw IllegalStateException("unable to read description.html")
36+
}
37+
3338
}

changenotes.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
<ul>
2+
<li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.4.0">1.4.0</a></b>
3+
Happy new year! Starter Pokémon from all 8 generations are now in the plugin.
4+
<ul>
5+
<li>slows the acceleration of the indeterminate progress bar, and makes it configurable</li>
6+
<li>new Gen III: Treecko, Sceptile, Torchic, Blaziken, Mudkip, Swampert</li>
7+
<li>new Gen V: Snivy, Serperior, Tepig, Emboar, Oshawott, Samurott</li>
8+
<li>new Gen VI: Chespin, Chesnaught, Fennekin, Delphox, Froakie, Greninja</li>
9+
<li>new Gen VII: Rowlet, Decidueye, Litten, Incineroar, Popplio, Primarina</li>
10+
</ul>
11+
</li>
212
<li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.3.1">1.3.1</a></b>
313
<ul>
414
<li>reverts Java version to 8 so plugin works with Android Studio</li>

0 commit comments

Comments
 (0)