Merge pull request #39 from kagof/release/1.4.0

Release/1.4.0
kagof · Jan 4, 2021 · ee6b9aa · ee6b9aa
2 parents 48d5c7e + 3a260f7
commit ee6b9aa
Show file tree

Hide file tree

Showing 109 changed files with 180 additions and 36 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -71,5 +71,5 @@ Preferably you should be using [signed commits](https://help.github.com/en/artic
 * if adding a new Pokémon:
     * 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)
     * [editSprite.sh](editSprite.sh) can be used to generate the required gifs from existing png images
-    * [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
+    * [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)
     * [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!)
diff --git a/README.md b/README.md
@@ -66,6 +66,12 @@ This is [a plugin](https://plugins.jetbrains.com/plugin/15090-pokemon-progress/v
 
 ### Generation III
 
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
 * ![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)
 * ![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)
 * ![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
 * ![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)
 * ![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)
 
+### Generation V
+
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+
 ### Generation VI
 
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
 * ![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)
 
 ### Generation VII
 
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
+* ![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)
 * ![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)
 
 ### Generation VIII
@@ -116,8 +143,16 @@ Contributions are very welcome on this project! Please see our [contributing gui
 * [Pokencyclopedia SpriteDex - Heart Gold & Soul Silver](https://www.pokencyclopedia.info/en/index.php?id=sprites/overworlds/o-r_hgss)
     * All Gen I-IV sprites unless otherwise noted
     * MissingNo.
+* [Kyle-Dove on DeviantArt](https://www.deviantart.com/kyle-dove/gallery)
+    * Snivy, Tepig, Oshawott
+* [cSc-A7X on DeviantArt](https://www.deviantart.com/csc-a7x/gallery)
+    * Serperior, Emboar, Samurott
+* [princess-phoenix on DeviantArt](https://www.deviantart.com/princess-phoenix/art/Gen-6-Kalos-Pokemon-Overworld-Sprites-525954409)
+    * All Gen VI sprites unless otherwise noted
 * [JuJoAura on DeviantArt](https://www.deviantart.com/jujoaura/art/Sylveon-Full-Sprite-379989482)
     * Sylveon
+* [Princess-Phoenix, Larryturbo, Kiddkatt, Zender1752, SageDeoxys, curated by Larryturbo](https://www.deviantart.com/larryturbo/art/Gen-7-Alola-Overworld-Sprites-805455576)
+    * All Gen VII sprites unless otherwise noted
 * [Bulbagarden Archives](https://archives.bulbagarden.net)
     * Mimikyu (first frame)
 * [SageDeoxys](https://www.pokecommunity.com/showthread.php?t=429414)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "com.kagof"
-version = "1.3.1"
+version = "1.4.0"
 
 repositories {
     mavenCentral()
@@ -30,4 +30,9 @@ tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml
         if (it.exists() && it.isFile && it.canRead()) changeNotes(it.readText())
         else throw IllegalStateException("unable to read changenotes.html")
     }
+    File("description.html").let {
+        if (it.exists() && it.isFile && it.canRead()) pluginDescription(it.readText())
+        else throw IllegalStateException("unable to read description.html")
+    }
+
 }
diff --git a/changenotes.html b/changenotes.html
@@ -1,4 +1,14 @@
 <ul>
+    <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.4.0">1.4.0</a></b>
+        Happy new year! Starter Pokémon from all 8 generations are now in the plugin.
+        <ul>
+            <li>slows the acceleration of the indeterminate progress bar, and makes it configurable</li>
+            <li>new Gen III: Treecko, Sceptile, Torchic, Blaziken, Mudkip, Swampert</li>
+            <li>new Gen V: Snivy, Serperior, Tepig, Emboar, Oshawott, Samurott</li>
+            <li>new Gen VI: Chespin, Chesnaught, Fennekin, Delphox, Froakie, Greninja</li>
+            <li>new Gen VII: Rowlet, Decidueye, Litten, Incineroar, Popplio, Primarina</li>
+        </ul>
+    </li>
     <li><b><a href="https://github.com/kagof/intellij-pokemon-progress/releases/tag/1.3.1">1.3.1</a></b>
         <ul>
             <li>reverts Java version to 8 so plugin works with Android Studio</li>