diff --git a/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java b/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java index d6daaab..d303f82 100644 --- a/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java +++ b/BlockMap-cli/src/main/java/de/piegames/blockmap/standalone/VersionProvider.java @@ -6,7 +6,7 @@ public class VersionProvider implements IVersionProvider { /* This part of the code gets generated automatically through `gradle generateSources`. Do not modify! */ // $REPLACE_START - public static final String VERSION = "2.2.0"; + public static final String VERSION = "2.2.1"; // $REPLACE_END @Override diff --git a/BlockMap-gui/src/main/java/de/piegames/blockmap/gui/VersionProvider.java b/BlockMap-gui/src/main/java/de/piegames/blockmap/gui/VersionProvider.java index 11e9e9d..fd3a237 100644 --- a/BlockMap-gui/src/main/java/de/piegames/blockmap/gui/VersionProvider.java +++ b/BlockMap-gui/src/main/java/de/piegames/blockmap/gui/VersionProvider.java @@ -3,6 +3,6 @@ public class VersionProvider { /* This part of the code gets generated automatically through `gradle generateSources`. Do not modify! */ // $REPLACE_START - public static final String VERSION = "2.2.0"; + public static final String VERSION = "2.2.1"; // $REPLACE_END } diff --git a/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/about/licenseReport.json b/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/about/licenseReport.json index aac2725..f9dd79b 100644 --- a/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/about/licenseReport.json +++ b/BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/about/licenseReport.json @@ -633,6 +633,23 @@ ], "dependency": "com.github.saibotk:JMAW:0.3.1" }, + { + "project": "Semver4j", + "description": "Semantic versioning for Java apps.", + "version": "3.1.0", + "developers": [ + "Vincent DURMONT" + ], + "url": "https://github.com/vdurmont/semver4j", + "year": null, + "licenses": [ + { + "license": "The MIT License", + "license_url": "http://www.opensource.org/licenses/mit-license.php" + } + ], + "dependency": "com.vdurmont:semver4j:3.1.0" + }, { "project": "Smile-core", "description": "smile-core", diff --git a/README.md b/README.md index 04a89db..0279671 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ - If you won't hack on the code itself, the JRE should suffice (in the downloads section, choose JRE over JDK) - Past experience has shown that Java updates are not as backwards-compatible as they could be. So while any newer Java version **should** work just fine, it has currently only been tested up to Java 14. If you encounter any problems that go away by downgrading Java, please open up an issue. -## Get it / Installation: +## Download / Installation: Download the latest version from the [Release page](https://github.com/piegamesde/BlockMap/releases). @@ -50,7 +50,7 @@ BlockMap hasn't been packaged for other distros yet (looking for maintainers). The GUI version should just run by (double)clicking it. Otherwise run it through: - java -jar BlockMap-gui-2.2.0.jar + java -jar BlockMap-gui-2.2.1.jar to start. If you installed BlockMap through a package manager, search for it in your launcher or menu. @@ -68,9 +68,9 @@ to start. If you installed BlockMap through a package manager, search for it in If you want to use BlockMap through the command line without, # For general usage help - java -jar BlockMap-cli-2.2.0.jar help + java -jar BlockMap-cli-2.2.1.jar help # For help about rendering worlds to a folder - java -jar BlockMap-cli-2.2.0.jar help render + java -jar BlockMap-cli-2.2.1.jar help render will get you started. On Linux even with colors! @@ -131,6 +131,7 @@ If you want to create a release jar and run it, use `./gradlew :BlockMap-gui:run - Regenerate all resources (see above) - If something in the UI changed, regenerate the screenshots - If some dependencies changed: Run `./gradlew licenseReport` and copy the generated JSON file to `./BlockMap-gui/src/main/resources/de/piegames/blockmap/gui/standalone/about/licenseReport.json` +- Commit the changes as `Version bump: $VESRION`. Add a tag with the version. Don't forget to push the tag as well! (`git push --tags`) - Generate the release binaries (need to be called on each target platform) - This will create two executable fat (=containing all needed dependencies) jars in `./BlockMap-{gui,cli}/build/libs/fat/`. - Release on GitHub diff --git a/build.gradle b/build.gradle index f83d3a7..c433c35 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { apply plugin: "com.github.ben-manes.versions" allprojects { - version = '2.2.0' + version = '2.2.1' repositories { jcenter() diff --git a/changelog.md b/changelog.md index 56063f0..ea6d395 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,17 @@ # Changelog +## Version 2.2.1 + +### Changes + +- Minor changes to the resource generation—CI is now slightly faster and should fail less often +- Updated screenshots in README + +### Bug fixes + +- Minor improvements in the open dialog +- Fixed pins for multiple maps on the exact same place + ## Version 2.2.0 ### Changes