Merge branch 'master' of github.com:PCGen/pcgen into master

README.md

@@ -10,7 +10,9 @@ It supports numerous game systems, most notably:
 - Starfinder
 
 # Table of Contents
-1. [Installing From Release](#installing-from-release)
+1. [Installing From Release 6.08](#installing-from-release-608)
+
+1. [Installing From Release 6.09 (Alpha)](#installing-from-release-609-alpha)
 
 1. [PCGen Needs You](#pcgen-needs-you)
 
@@ -24,7 +26,7 @@ It supports numerous game systems, most notably:
 
 1. [Essential Gradle Tasks](#essential-gradle-tasks)
 
-# Installing From Release
+# Installing From Release 6.08
 1. Install Java.
    - JDK 11 is recommended and has long term support, later versions should also work. 10 and below are not supported.
    - To check if you have Java installed, see [Install Java](#install-java)
@@ -33,9 +35,34 @@ It supports numerous game systems, most notably:
 1. Download and extract the full zip file from https://github.com/PCGen/pcgen/releases/latest.
 
 1. You should now be able to run PCGen. The exact invocation depends on your operating system, but you should be able to either double-click to launch the file for your platform.
-    - Windows: pcgen.exe (pcgen.bat for command-line users)
-    - Linux: pcgen.sh 
-    - Mac: pcgen.jar (or pcgen.dmg if it exists)
+    - Windows: `pcgen.exe` (`pcgen.bat` for command-line users)
+    - Linux: `pcgen.sh` 
+    - Mac: `pcgen.jar` (or `pcgen.dmg` if it exists)
+
+# Installing From Release 6.09 (Alpha)
+> Note: Java does not need to be preinstalled with PcGen >6.09.05
+
+## Using Zip bundle
+1. Download and extract the full zip file from https://github.com/PCGen/pcgen/releases/ labled 6.09.xx.
+
+1. You should now be able to run PCGen. The exact invocation depends on your operating system, but you should be able to either double-click to launch the file for your platform.
+    - Windows: `pcgen.exe` (`pcgen.bat` for command-line users)
+    - Linux: `pcgen.sh`
+    - Mac: `pcgen.sh` (or `pcgen.dmg` if it exists. Launching .jar may throw java errors so generally avoid)
+
+## Using installer (windows and mac only)
+1. Download and extract the full installer from https://github.com/PCGen/pcgen/releases/ labled 6.09.xx. 
+    - Windows: `pcgen-6.09.xx_win_install.exe`
+    - Mac: `pcgen-6.09.xx.dmg` or `pcgen-6.09.xx.pkg`
+
+1. Run installer and follow instruction
+   - Windows: Open `pcgen-6.09.xx_win_install.exe`
+   - Mac:
+   - - `dmg`: Open `dmg` and drag into Applications. Right click on `PcGen` and click open.
+   - - `pkg`: Right click and `pkg` and click open and click `open` on security warning due to application being unsigned. 
+
+1. You should be able to launch PcGen as normal application.
+   -  Mac: You may need to on first launch right click on application and then click `open`.
 
 # PCGen Needs You
 
@@ -84,7 +111,8 @@ Check the installed version with:
 
     java -version
 
-You will want Java with a minimum version of 11.
+For 6.08 development you will want Java with a minimum version of 11.
+For 6.09 development you will want Java with a minimum version of 14.
 You can install the latest version from [AdoptOpenJDK](https://adoptopenjdk.net) regardless of your OS, please see instructions there.
 
 ### Install Git

build.gradle

@@ -20,14 +20,14 @@ plugins {
     id 'application'
     id 'build-dashboard'
     id 'checkstyle'
-    id "com.github.spotbugs" version '4.5.1'
+    id "com.github.spotbugs" version '4.6.0'
     id 'java'
     id 'maven-publish'
     id 'pmd'
     id 'idea'
     id "de.undercouch.download" version '4.1.1'
-    id 'edu.sc.seis.launch4j' version '2.4.8'
-    id 'com.github.ben-manes.versions' version '0.33.0'
+    id 'edu.sc.seis.launch4j' version '2.4.9'
+    id 'com.github.ben-manes.versions' version '0.36.0'
     id "com.dorongold.task-tree" version '1.5'
     id 'org.openjfx.javafxplugin' version '0.0.9'
     id 'org.beryx.runtime' version '1.11.4'
@@ -164,12 +164,9 @@ compileJava {
 dependencies {
     implementation group: 'commons-io', name: 'commons-io', version:'2.8.0'
 
-    implementation group: 'org.springframework', name: 'spring-web', version:'5.2.9.RELEASE'
-    implementation group: 'org.springframework', name: 'spring-beans', version:'5.2.9.RELEASE'
-    implementation group: 'org.springframework', name: 'spring-core', version:'5.2.9.RELEASE'
-    implementation group: 'org.springframework', name: 'spring-web', version:'5.2.9.RELEASE'
-    implementation group: 'org.springframework', name: 'spring-beans', version:'5.2.9.RELEASE'
-    implementation group: 'org.springframework', name: 'spring-core', version:'5.2.9.RELEASE'
+    implementation group: 'org.springframework', name: 'spring-web', version:'5.3.1'
+    implementation group: 'org.springframework', name: 'spring-beans', version:'5.3.1'
+    implementation group: 'org.springframework', name: 'spring-core', version:'5.3.1'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version:'3.11'
     compile('org.apache.xmlgraphics:fop:2.5')
     {
@@ -184,8 +181,8 @@ dependencies {
         exclude group: 'xml-apis', module: 'xml-apis'
     }
     implementation group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: '0.8.1'
-    implementation group: 'org.xmlunit', name: 'xmlunit-core', version:'2.7.0'
-    implementation group: 'org.controlsfx', name: 'controlsfx', version:'11.0.2'
+    implementation group: 'org.xmlunit', name: 'xmlunit-core', version:'2.8.0'
+    implementation group: 'org.controlsfx', name: 'controlsfx', version:'11.0.3'
 
     implementation group: 'net.sourceforge.pcgen', name: 'PCGen-base', version:'1.0.170'
     implementation group: 'net.sourceforge.pcgen', name: 'PCGen-Formula', version:'1.0.200'
@@ -204,7 +201,7 @@ dependencies {
     testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-12.0.1+2'
 
 
-    testImplementation group: 'org.xmlunit', name: 'xmlunit-matchers', version:'2.7.0'
+    testImplementation group: 'org.xmlunit', name: 'xmlunit-matchers', version:'2.8.0'
 }
 
 ant.importBuild 'build-gradle.xml'

data/pathfinder/paizo/roleplaying_game/advanced_class_guide/acg_abilities_class.lst

@@ -228,7 +228,7 @@ Undead School		KEY:Arcanist School ~ Undead		CATEGORY:Special Ability	TYPE:Speci
 Void School			KEY:Arcanist School ~ Void		CATEGORY:Special Ability	TYPE:SpecialQuality.ArcanistSchool	DEFINE:VoidSchoolLVL|0	DEFINE:VoidSchoolProgressionLVL|0					BONUS:VAR|VoidSchoolLVL|ArcaneSchoolLVL	BONUS:VAR|VoidSchoolProgressionLVL|ArcaneSchoolProgressionLVL
 
 
-Void Elemental School	CATEGORY:Special Ability	TYPE:SpecialQuality.WizardClassFeatures.ClassSpecialization.ArcaneSchool	DEFINE:VoidElementalSchoolLVL|0	DEFINE:VoidElementalSchoolProgressionLVL|0	DESC:The void is a complex idea considered by some to be a fifth element - one that comprises thought, space, spiritualism, and insight. Wizards who tap into its mysterious powers gain control over energies that bind the earth to the heavens and the planes to their mysterious and eternal alignments, as well as the powers that stitch living beings to their spirits. The void elemental school presented here is an additional arcane school for the wizard class.	ABILITY:Special Ability|AUTOMATIC|Void Elemental School ~ Reveal Weakness|Void Elemental School ~ Void Awareness|Void Elemental School ~ Void Magic	ABILITY:Special Ability|AUTOMATIC|Void Elemental School ~ Aura of Prescience|PREVARGTEQ:VoidElementalSchoolProgressionLVL,8	BONUS:ABILITYPOOL|Elemental Opposition School|1	BONUS:VAR|VoidElementalSchoolLVL|WizardSchoolLvl	BONUS:VAR|VoidElementalSchoolProgressionLVL|ArcaneSchoolProgressionLVL	SOURCEPAGE:p.142
+Arcanist School Void	CATEGORY:Special Ability	TYPE:SpecialQuality.WizardClassFeatures.ClassSpecialization.ArcaneSchool	DEFINE:VoidElementalSchoolLVL|0	DEFINE:VoidElementalSchoolProgressionLVL|0	DESC:The void is a complex idea considered by some to be a fifth element - one that comprises thought, space, spiritualism, and insight. Wizards who tap into its mysterious powers gain control over energies that bind the earth to the heavens and the planes to their mysterious and eternal alignments, as well as the powers that stitch living beings to their spirits. The void elemental school presented here is an additional arcane school for the wizard class.	ABILITY:Special Ability|AUTOMATIC|Arcanist School Void ~ Reveal Weakness|Arcanist School Void ~ Void Awareness|Arcanist School Void ~ Void Magic	ABILITY:Special Ability|AUTOMATIC|Arcanist School Void ~ Aura of Prescience|PREVARGTEQ:VoidElementalSchoolProgressionLVL,8	BONUS:ABILITYPOOL|Arcane Opposition School|1	BONUS:VAR|VoidElementalSchoolLVL|WizardSchoolLvl	BONUS:VAR|VoidElementalSchoolProgressionLVL|ArcaneSchoolProgressionLVL	SOURCEPAGE:p.142
 
 
 ###Block: Void Elemental School

data/pathfinder/paizo/roleplaying_game/advanced_class_guide/acg_abilitycategories.lst

@@ -220,6 +220,7 @@ ABILITYCATEGORY:Raging Blood Feat Bloodline				VISIBLE:NO	CATEGORY:Raging Blood
 
 ABILITYCATEGORY:Mutation Warrior Mutagen Selection		VISIBLE:QUALIFY	EDITABLE:YES	EDITPOOL:NO		FRACTIONALPOOL:NO									CATEGORY:Special Ability	TYPE:Mutation Warrior Mutagen Selection																		DISPLAYLOCATION:Class Features
 
+ABILITYCATEGORY:Elemental Opposition School	VISIBLE:QUALIFY	EDITABLE:YES	EDITPOOL:YES	FRACTIONALPOOL:NO		CATEGORY:Special Ability	TYPE:ElementalOppositionSchool	PLURAL:Elemental Opposition Schools		DISPLAYLOCATION:Class Abilities
 
 #
 # End