Updated for 3.4.7 release.

vassalengine · Oct 25, 2020 · 5b85fc9 · 5b85fc9
1 parent 812a108
commit 5b85fc9
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 38 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,4 @@
-3.4.7 - ???
+3.4.7 - 25 October 2020
 
 * 13547: Don't raise a bug dialog on failure to read an MP3
 * 13546: Change backup Resource directory from temp folder to base folder

diff --git a/Makefile b/Makefile
@@ -46,9 +46,9 @@ JDOCDIR:=jdoc
 # numeric part of the version only
 VNUM:=3.4.7
 
-MAVEN_VERSION:=$(VNUM)-SNAPSHOT
+#MAVEN_VERSION:=$(VNUM)-SNAPSHOT
 #MAVEN_VERSION:=$(VNUM)-beta1
-#MAVEN_VERSION:=$(VNUM)
+MAVEN_VERSION:=$(VNUM)
 
 JARNAME:=vassal-app-$(MAVEN_VERSION)
 

diff --git a/dist/notes/NOTES-bgg b/dist/notes/NOTES-bgg
@@ -1,5 +1,5 @@
-[size=18][b]VASSAL 3.4.6 Released[/b][/size]
-The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
+[size=18][b]VASSAL 3.4.7 Released[/b][/size]
+The VASSAL Team is happy to announce the release of VASSAL 3.4.7.
 
 [size=16][b]IMPORTANT[/b][/size]
 * Things may be broken which worked previously. If you find a new bug, please report it.
@@ -9,11 +9,24 @@ The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
 * Some modules containing custom drawing code may render incorrectly on HiDPI displays, starting with 3.3. If you are the maintainer of such a module, let us know and we can advise you about what needs updating for 3.4 in your code.
 
 [size=16][b]Download[/b][/size]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-linux.tar.bz2]Linux[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-macosx.dmg]Mac OS X[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-64.exe]Windows (64-bit)[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-32.exe]Windows (32-bit)[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-other.zip]Other[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-linux.tar.bz2]Linux[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-macosx.dmg]Mac OS X[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-64.exe]Windows (64-bit)[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-32.exe]Windows (32-bit)[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-other.zip]Other[/url]
+
+[size=16][b]Changes since 3.4.6[/b][/size]
+
+Bug fixes
+
+* 13547: Don't raise a bug dialog on failure to read an MP3
+* 13546: Change backup Resource directory from temp folder to base folder
+* 13542: Interaction between Move Fixed Distance and Rotate traits has changed between 3.2.17 and 3.4.6
+* 13540: Macs now use Command as modifier key for grid-resizing, setup-stack-moving in Editor
+* 13525: HFS+ stores filenames in NFD, so must check for that variant when loading
+* 13524: Masked card dragged from Player Hand reports differently between 3.2.17 and 3.4.6
+* 13520: Made Command+Click the select/deselect combo for Macs (and Command+Wheel to zoom)
+* 13489: Pieces scaled incorrectly during drags on HiDPI screens on Windows
 
 [size=16][b]Changes since 3.4.5[/b][/size]
 

diff --git a/dist/notes/NOTES-csw b/dist/notes/NOTES-csw
@@ -1,4 +1,4 @@
-The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
+The VASSAL Team is happy to announce the release of VASSAL 3.4.7.
 
 <h3>IMPORTANT</h3>
 * Things may be broken which worked previously. If you find a new bug, please report it.
@@ -7,11 +7,23 @@ The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
 
 * Some modules containing custom drawing code may render incorrectly on HiDPI displays, starting with 3.3. If you are the maintainer of such a module, let us know and we can advise you about what needs updating for 3.4 in your code.
 <h3>Download</h3>
-* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-linux.tar.bz2' target='_new'>Linux</a>
-* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-macosx.dmg' target='_new'>Mac OS X</a>
-* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-64.exe' target='_new'>Windows (64-bit)</a>
-* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-32.exe' target='_new'>Windows (32-bit)</a>
-* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-other.zip'  target='_new'>Other</a>
+* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-linux.tar.bz2' target='_new'>Linux</a>
+* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-macosx.dmg' target='_new'>Mac OS X</a>
+* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-64.exe' target='_new'>Windows (64-bit)</a>
+* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-32.exe' target='_new'>Windows (32-bit)</a>
+* <a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-other.zip'  target='_new'>Other</a>
+
+<h3>Changes since 3.4.5</h3>
+Bug fixes
+
+* 13547: Don't raise a bug dialog on failure to read an MP3
+* 13546: Change backup Resource directory from temp folder to base folder
+* 13542: Interaction between Move Fixed Distance and Rotate traits has changed between 3.2.17 and 3.4.6
+* 13540: Macs now use Command as modifier key for grid-resizing, setup-stack-moving in Editor
+* 13525: HFS+ stores filenames in NFD, so must check for that variant when loading
+* 13524: Masked card dragged from Player Hand reports differently between 3.2.17 and 3.4.6
+* 13520: Made Command+Click the select/deselect combo for Macs (and Command+Wheel to zoom)
+* 13489: Pieces scaled incorrectly during drags on HiDPI screens on Windows
 
 <h3>Changes since 3.4.5</h3>
 Bug fixes

diff --git a/dist/notes/NOTES-news b/dist/notes/NOTES-news
@@ -1,5 +1,5 @@
 <p>
-The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
+The VASSAL Team is happy to announce the release of VASSAL 3.4.7.
 </p>
 
 <h2>IMPORTANT</h2>
@@ -11,11 +11,24 @@ The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
 
 <h2>Download</h2>
 <ul>
-  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-linux.tar.bz2' target='_new'>Linux</a></li>
-  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-macosx.dmg' target='_new'>Mac OS X</a></li>
-  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-64.exe' target='_new'>Windows (64-bit)</a></li>
-  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-32.exe' target='_new'>Windows (32-bit)</a></li>
-  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-other.zip'  target='_new'>Other</a></li>
+  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-linux.tar.bz2' target='_new'>Linux</a></li>
+  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-macosx.dmg' target='_new'>Mac OS X</a></li>
+  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-64.exe' target='_new'>Windows (64-bit)</a></li>
+  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-32.exe' target='_new'>Windows (32-bit)</a></li>
+  <li><a href='https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-other.zip'  target='_new'>Other</a></li>
+</ul>
+
+<h2>Changes since 3.4.5</h2>
+<h3>Bug fixes</h3>
+<ul>
+<li>13547: Don't raise a bug dialog on failure to read an MP3</li>
+<li>13546: Change backup Resource directory from temp folder to base folder</li>
+<li>13542: Interaction between Move Fixed Distance and Rotate traits has changed between 3.2.17 and 3.4.6</li>
+<li>13540: Macs now use Command as modifier key for grid-resizing, setup-stack-moving in Editor</li>
+<li>13525: HFS+ stores filenames in NFD, so must check for that variant when loading</li>
+<li>13524: Masked card dragged from Player Hand reports differently between 3.2.17 and 3.4.6</li>
+<li>13520: Made Command+Click the select/deselect combo for Macs (and Command+Wheel to zoom)</li>
+<li>13489: Pieces scaled incorrectly during drags on HiDPI screens on Windows</li>
 </ul>
 
 <h2>Changes since 3.4.5</h2>

diff --git a/dist/notes/NOTES-vassalforum b/dist/notes/NOTES-vassalforum
@@ -1,6 +1,6 @@
-[size=200][b]VASSAL 3.4.6 Released[/b][/size]
+[size=200][b]VASSAL 3.4.7 Released[/b][/size]
 
-The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
+The VASSAL Team is happy to announce the release of VASSAL 3.4.7.
 
 [size=150][b]IMPORTANT[/b][/size]
 
@@ -12,11 +12,24 @@ The VASSAL Team is happy to announce the release of VASSAL 3.4.6.
 
 [size=150][b]Download[/b][/size]
 
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-linux.tar.bz2]Linux[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-macosx.dmg]Mac OS X[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-64.exe]Windows (64-bit)[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-windows-32.exe]Windows (32-bit)[/url]
-[url=https://github.com/vassalengine/vassal/releases/download/3.4.6/VASSAL-3.4.6-other.zip]Other[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-linux.tar.bz2]Linux[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-macosx.dmg]Mac OS X[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-64.exe]Windows (64-bit)[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-windows-32.exe]Windows (32-bit)[/url]
+[url=https://github.com/vassalengine/vassal/releases/download/3.4.7/VASSAL-3.4.7-other.zip]Other[/url]
+
+[size=150][b]Changes since 3.4.6[/b][/size]
+
+Bug fixes
+
+* 13547: Don't raise a bug dialog on failure to read an MP3
+* 13546: Change backup Resource directory from temp folder to base folder
+* 13542: Interaction between Move Fixed Distance and Rotate traits has changed between 3.2.17 and 3.4.6
+* 13540: Macs now use Command as modifier key for grid-resizing, setup-stack-moving in Editor
+* 13525: HFS+ stores filenames in NFD, so must check for that variant when loading
+* 13524: Masked card dragged from Player Hand reports differently between 3.2.17 and 3.4.6
+* 13520: Made Command+Click the select/deselect combo for Macs (and Command+Wheel to zoom)
+* 13489: Pieces scaled incorrectly during drags on HiDPI screens on Windows
 
 [size=150][b]Changes since 3.4.5[/b][/size]
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.vassalengine</groupId>
     <artifactId>vassal-parent</artifactId>
-    <version>3.4.7-SNAPSHOT</version>
+    <version>3.4.7</version>
     <packaging>pom</packaging>
 
     <name>Vassal Engine</name>

diff --git a/release-prepare/pom.xml b/release-prepare/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.4.7-SNAPSHOT</version>
+        <version>3.4.7</version>
     </parent>
 
     <artifactId>release-prepare</artifactId>
-    <version>3.4.7-SNAPSHOT</version>
+    <version>3.4.7</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.4.7-SNAPSHOT</version>
+        <version>3.4.7</version>
     </parent>
 
     <artifactId>vassal-app</artifactId>
-    <version>3.4.7-SNAPSHOT</version>
+    <version>3.4.7</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

diff --git a/vassal-deprecation/pom.xml b/vassal-deprecation/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.4.7-SNAPSHOT</version>
+        <version>3.4.7</version>
     </parent>
 
     <artifactId>vassal-deprecation</artifactId>
-    <version>3.4.7-SNAPSHOT</version>
+    <version>3.4.7</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/vassal-doc/pom.xml b/vassal-doc/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.vassalengine</groupId>
         <artifactId>vassal-parent</artifactId>
-        <version>3.4.7-SNAPSHOT</version>
+        <version>3.4.7</version>
     </parent>
 
     <artifactId>vassal-doc</artifactId>
-    <version>3.4.7-SNAPSHOT</version>
+    <version>3.4.7</version>
 
     <build>
         <plugins>