diff --git a/CITATION.cff b/CITATION.cff index f7323ad3..9de20d9b 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -1,6 +1,6 @@ cff-version: 1.2.0 title: MORTAR -version: 1.0.3.0 +version: 1.0.4.0 message: "If you use this software, please cite it as below." type: software authors: @@ -25,7 +25,6 @@ authors: - family-names: "Zielesny" given-names: "Achim" orcid: "https://orcid.org/0000-0003-0722-4229" -doi: "https://doi.org/10.5281/zenodo.7035389" -date-released: 2022-08-30 +date-released: 2022-10-04 url: "https://github.com/FelixBaensch/MORTAR" license: GPL-3.0 \ No newline at end of file diff --git a/Distributions/distributions.md b/Distributions/distributions.md index c3e0168a..bf0e5c36 100644 --- a/Distributions/distributions.md +++ b/Distributions/distributions.md @@ -1,4 +1,4 @@ ## MORTAR distributions Due to the file size limit of GitHub, we could not deposit the distribution files of MORTAR in this folder as well, as we originally planned. You can find the distributions of MORTAR's latest version attached to the release marked here -on GitHub: [https://github.com/FelixBaensch/MORTAR/releases/tag/v1.0.3.0](https://github.com/FelixBaensch/MORTAR/releases/tag/v1.0.3.0) \ No newline at end of file +on GitHub: [https://github.com/FelixBaensch/MORTAR/releases/tag/v1.0.4.0](https://github.com/FelixBaensch/MORTAR/releases/tag/v1.0.4.0) \ No newline at end of file diff --git a/README.md b/README.md index 4cb60319..a9b87480 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ also attached to the marked releases.
executable, start, and follow the instructions to install MORTAR. Note that the installation includes a full Java Runtime Environment (JRE). After installation, create a shortcut to an appropriate MORTAR start batch file on your Windows desktop. E.g. for MORTAR to use up to 4 gigabyte of RAM, copy a shortcut to batch file "MORTAR.bat" which is -located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.0.3.0\bin" or the path specified at +located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.0.4.0\bin" or the path specified at installation). To start MORTAR, double click the created shortcut. MORTAR can be uninstalled by the provided Uninstall.exe executable in the MORTAR program folder or standard Windows functions.
As an alternative to "MORTAR.bat", there is also the "MORTAR_20GB.bat" batch file available that allocates up to @@ -62,17 +62,17 @@ with your chosen initially allocated memory (-Xms) and maximum value (-Xmx) acco described below. As an alternative way, they should also work on Windows.

-

Linux and macOS: The "distribution" folder contains the executable Java ARchive (JAR) "MORTAR-fat-1.0.3.0.jar" +

Linux and macOS: The "distribution" folder contains the executable Java ARchive (JAR) "MORTAR-fat-1.0.4.0.jar" which contains the packaged MORTAR code together with all dependencies. To run MORTAR (with up to 4 GB of RAM available, e.g.), execute the JAR from the command-line using

-

java -jar -Xms512m -Xmx4g [path to]MORTAR-fat-1.0.3.0.jar

+

java -jar -Xms512m -Xmx4g [path to]MORTAR-fat-1.0.4.0.jar

A JDK or JRE of version 17.0.4 or higher needs to be installed on your system and linked to the "java" command. Otherwise, replace "java" with the path to the java command of your JDK or JRE.

Please note that MORTAR only supports x64 (on all three platforms) and AArch64 (on macOS and Linux) architectures in general. -For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.0.3.0.jar" is available from the distributions and must be used.

+For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.0.4.0.jar" is available from the distributions and must be used.

Also note that using the Windows Subsystem for Linux (WSL) is not recommended, since a lot of additional configurations have to be made there to run Java GUI applications. diff --git a/Tutorial/MORTAR_Tutorial.pdf b/Tutorial/MORTAR_Tutorial.pdf index c41b1e9e..5b0e5790 100644 Binary files a/Tutorial/MORTAR_Tutorial.pdf and b/Tutorial/MORTAR_Tutorial.pdf differ diff --git a/build.gradle b/build.gradle index 1d8b9c35..3d0bdc99 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group 'de.unijena.cheminf' -version '1.0.3.0' +version '1.0.4.0' sourceCompatibility = 1.17 diff --git a/src/main/java/de/unijena/cheminf/mortar/model/util/BasicDefinitions.java b/src/main/java/de/unijena/cheminf/mortar/model/util/BasicDefinitions.java index 914f44f7..52210560 100644 --- a/src/main/java/de/unijena/cheminf/mortar/model/util/BasicDefinitions.java +++ b/src/main/java/de/unijena/cheminf/mortar/model/util/BasicDefinitions.java @@ -144,7 +144,7 @@ public final class BasicDefinitions { /** * Version of application */ - public static final String MORTAR_VERSION = "1.0.3.0"; + public static final String MORTAR_VERSION = "1.0.4.0"; // // //