From ed6586d0829953aae523fb6cfee801312d636072 Mon Sep 17 00:00:00 2001 From: dc37 Date: Tue, 13 Aug 2024 00:05:55 -0700 Subject: [PATCH] Roll version v1.3.2 with cherry-picks --- README.md | 1 + SMP_J1_8.bat | 4 ++-- SMP_J9.bat | 4 ++-- SMP_Release.bat | 5 +++-- Version History.txt | 1 + src/smp/SuperMarioPaint.java | 4 +++- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8329ba2..f721b48 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ https://docs.google.com/document/d/1zLSkC-clCSxvVUnbYQAxImmJA-QSwSSyzuC62enLiLc/ Major Releases: ----- See "Version History.txt" for semantic versioning and more release notes. +* August 12-13, 2024 - v1.4.4 and v1.3.2 release with Linux updates * October 17-19, 2021 - v1.4.3 release with more backend upgrades and Java9+ support with release automation scripts * June 24, 2020 - v1.4.2 release with more backend upgrades * June 7, 2020 - v1.4.1 release with some backend upgrades carried over from v1.3.0 diff --git a/SMP_J1_8.bat b/SMP_J1_8.bat index 0b933ec..45444e8 100644 --- a/SMP_J1_8.bat +++ b/SMP_J1_8.bat @@ -1,5 +1,5 @@ @echo off -title Super Mario Paint v1.4.3 -java -jar ./SMPv1.4.3.jar +title Super Mario Paint v1.3.2 +java -jar ./SMPv1.3.2_J1_8.jar echo [Done] pause \ No newline at end of file diff --git a/SMP_J9.bat b/SMP_J9.bat index 7ca60f7..07f27a2 100644 --- a/SMP_J9.bat +++ b/SMP_J9.bat @@ -1,5 +1,5 @@ @echo off -title Super Mario Paint v1.4.3 -java --add-modules=ALL-MODULE-PATH -p "./jfx11/lib/javafx.base.jar;./jfx11/lib/javafx.controls.jar;./jfx11/lib/javafx.fxml.jar;./jfx11/lib/javafx.graphics.jar;./jfx11/lib/javafx.media.jar" -jar ./SMPv1.4.3.jar +title Super Mario Paint v1.3.2 +java --add-modules=ALL-MODULE-PATH -p "./jfx11/lib/javafx.base.jar;./jfx11/lib/javafx.controls.jar;./jfx11/lib/javafx.fxml.jar;./jfx11/lib/javafx.graphics.jar;./jfx11/lib/javafx.media.jar" -jar ./SMPv1.3.2_J9.jar echo [Done] pause \ No newline at end of file diff --git a/SMP_Release.bat b/SMP_Release.bat index f5f12b1..9ae13fe 100644 --- a/SMP_Release.bat +++ b/SMP_Release.bat @@ -1,5 +1,5 @@ @echo on -set version=1.4.3 +set version=1.3.2 set t=Super Mario Paint title %t% %version% Release Script @@ -18,5 +18,6 @@ for /f "tokens=*" %%i in (flist.txt) DO ( xcopy "%src_folder%\%%i" "%dst_folder%" /Y ) -xcopy "%src_folder%\SMPv%version%.jar" "%dst_folder%" /Y +xcopy "%src_folder%\SMPv%version%_J1_8.jar" "%dst_folder%" /Y +xcopy "%src_folder%\SMPv%version%_J9.jar" "%dst_folder%" /Y pause \ No newline at end of file diff --git a/Version History.txt b/Version History.txt index acbf994..97f148e 100644 --- a/Version History.txt +++ b/Version History.txt @@ -7,6 +7,7 @@ Bugfix = No new features added, but addresses some bugs. v1.4.4 v1.3.2 Hotfixes to allow Linux users to run v1.3.x and v1.4.x +Thanks to @rozlynd v1.4.3 More edits to prevent random clicks while in dialogs diff --git a/src/smp/SuperMarioPaint.java b/src/smp/SuperMarioPaint.java index 7b75ca1..b5dc3dc 100644 --- a/src/smp/SuperMarioPaint.java +++ b/src/smp/SuperMarioPaint.java @@ -58,11 +58,13 @@ * j574y923 (2017 - current) * CyanSMP64 (2019 - current) * seymour (2020 - current) - * + * rozlynd (2024 - current) + * * @author RehdBlob * @author j574y923 * @author CyanSMP64 * @author seymour + * @author rozlynd * * @since 2012.08.16 * @version 1.3.2