From cf3daf6548bcb3f1b7b0b055e80f776de2d824e2 Mon Sep 17 00:00:00 2001 From: Joel Uckelman Date: Fri, 12 Nov 2021 15:46:37 +0000 Subject: [PATCH] Updated for 3.6.0-beta6. --- CHANGES | 3 ++- Makefile | 4 ++-- dist/notes/data.json | 9 +++++---- pom.xml | 2 +- release-prepare/pom.xml | 4 ++-- vassal-app/pom.xml | 4 ++-- vassal-deprecation/pom.xml | 4 ++-- vassal-doc/pom.xml | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/CHANGES b/CHANGES index 543f43be7f..2f36525ff3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ -3.6.0-beta6 - ??? +3.6.0-beta6 - 12 November 2021 +* 10736: 'Deal cards out' to other players * 10734: No refresh allowed during replay * 10731: Add description fields to most important editor components * 10730: Improve Game Piece Palette doc per forum suggestion (AsciiDoc file diff --git a/Makefile b/Makefile index f1f954fc80..7c8855f186 100644 --- a/Makefile +++ b/Makefile @@ -51,8 +51,8 @@ VNUM:=3.6.0 # major-minor part of the version V_MAJ_MIN:=$(shell echo "$(VNUM)" | cut -f1,2 -d'.') -MAVEN_VERSION:=$(VNUM)-SNAPSHOT -#MAVEN_VERSION:=$(VNUM)-beta5 +#MAVEN_VERSION:=$(VNUM)-SNAPSHOT +MAVEN_VERSION:=$(VNUM)-beta6 #MAVEN_VERSION:=$(VNUM) JARNAME:=vassal-app-$(MAVEN_VERSION) diff --git a/dist/notes/data.json b/dist/notes/data.json index 247a5be6a1..5f8b58d98d 100644 --- a/dist/notes/data.json +++ b/dist/notes/data.json @@ -20,6 +20,7 @@ "in": "3.6.0-beta6", "since": "3.6.0-beta5", "new_features": [ + { "num": 10736, "desc": "'Deal cards out' to other players" }, { "num": 10728, "desc": "Allow 'Prompt' Dice Button values to be locked by designer" }, { "num": 10727, "desc": "Module Debug Window" }, { "num": 10719, "desc": "Deck Refresher" }, @@ -67,10 +68,10 @@ { "num": 10700, "desc": "Improved bug dialog text" }, { "num": 10699, "desc": "Repositioning Stacks/Decks optionally draws ghosted images of other stacks/decks" }, { "num": 10696, "desc": "Global Key Commands \"Within a Deck, select Fixed number of pieces\" field now supports expressions" }, - { "num": 10691i, "desc": "Mouseover Stack Viewer - Unstatic a naughty field and add ability to count face down cards in a deck" }, - { "num": 10686, "Decks - fill out the rest of the commands with hotkeys and report formats" }, - { "num": 10681, "Better documented pieceName vs PieceName" }, - { "num": 10676, "Upgrade to Java 17.0.1+12 for Windows, Mac packages" }, + { "num": 10691, "desc": "Mouseover Stack Viewer - Unstatic a naughty field and add ability to count face down cards in a deck" }, + { "num": 10686, "desc": "Decks - fill out the rest of the commands with hotkeys and report formats" }, + { "num": 10681, "desc": "Better documented pieceName vs PieceName" }, + { "num": 10676, "desc": "Upgrade to Java 17.0.1+12 for Windows, Mac packages" }, { "num": 10673, "desc": "Added Game Refresher documentation" }, { "num": 10672, "desc": "Multiplayer Server controls have improved feedback / UX" }, { "num": 10667, "desc": "Private Message windows no longer prompt to ignore every time you close them; incoming private messages do not grab focus" }, diff --git a/pom.xml b/pom.xml index 38f0c02c11..4c3cd5da89 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.vassalengine vassal-parent - 3.6.0-SNAPSHOT + 3.6.0-beta6 pom Vassal Engine diff --git a/release-prepare/pom.xml b/release-prepare/pom.xml index 665714d544..cb64a6dcb2 100644 --- a/release-prepare/pom.xml +++ b/release-prepare/pom.xml @@ -5,11 +5,11 @@ org.vassalengine vassal-parent - 3.6.0-SNAPSHOT + 3.6.0-beta6 release-prepare - 3.6.0-SNAPSHOT + 3.6.0-beta6 pom diff --git a/vassal-app/pom.xml b/vassal-app/pom.xml index 25c949bf2a..1368bacc7d 100644 --- a/vassal-app/pom.xml +++ b/vassal-app/pom.xml @@ -5,11 +5,11 @@ org.vassalengine vassal-parent - 3.6.0-SNAPSHOT + 3.6.0-beta6 vassal-app - 3.6.0-SNAPSHOT + 3.6.0-beta6 jar ${project.artifactId} diff --git a/vassal-deprecation/pom.xml b/vassal-deprecation/pom.xml index a282656bb9..83b5dc7f43 100644 --- a/vassal-deprecation/pom.xml +++ b/vassal-deprecation/pom.xml @@ -5,11 +5,11 @@ org.vassalengine vassal-parent - 3.6.0-SNAPSHOT + 3.6.0-beta6 vassal-deprecation - 3.6.0-SNAPSHOT + 3.6.0-beta6 jar diff --git a/vassal-doc/pom.xml b/vassal-doc/pom.xml index 12ac94e534..1b3b601a27 100644 --- a/vassal-doc/pom.xml +++ b/vassal-doc/pom.xml @@ -5,11 +5,11 @@ org.vassalengine vassal-parent - 3.6.0-SNAPSHOT + 3.6.0-beta6 vassal-doc - 3.6.0-SNAPSHOT + 3.6.0-beta6 ${project.basedir}${file.separator}..