Skip to content

Commit

Permalink
Merge branch 'master' into java21
Browse files Browse the repository at this point in the history
  • Loading branch information
@karianna
karianna authored Sep 30, 2024
2 parents 24cc6d9 + 816c09f commit 6b9ac12
Show file tree
Hide file tree
Showing 19 changed files with 472 additions and 465 deletions.
24 changes: 12 additions & 12 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,12 +219,12 @@ tasks.register("cleanMasterSheets", Delete) {
dependencies {
implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'

implementation group: 'commons-io', name: 'commons-io', version:'2.16.0'
implementation group: 'commons-io', name: 'commons-io', version:'2.17.0'

implementation group: 'org.springframework', name: 'spring-web', version:'6.1.11'
implementation group: 'org.springframework', name: 'spring-beans', version:'6.1.11'
implementation group: 'org.springframework', name: 'spring-core', version:'6.1.11'
implementation group: 'org.apache.commons', name: 'commons-lang3', version:'3.15.0'
implementation group: 'org.springframework', name: 'spring-web', version:'6.1.13'
implementation group: 'org.springframework', name: 'spring-beans', version:'6.1.13'
implementation group: 'org.springframework', name: 'spring-core', version:'6.1.13'
implementation group: 'org.apache.commons', name: 'commons-lang3', version:'3.17.0'
implementation group: 'xalan', name: 'serializer', version: '2.7.3'
implementation('org.apache.xmlgraphics:fop:2.9')
{
Expand Down Expand Up @@ -254,16 +254,16 @@ dependencies {
// Use if you're working from your local PCGen Formula
//implementation files("../pcgen-formula/PCGen-formula/build/libs/PCgen-formula-1.0.jar")

compileOnly group: 'org.jetbrains', name: 'annotations', version: '24.1.0'
compileOnly group: 'org.jetbrains', name: 'annotations', version:'25.0.0'
compileOnly group: 'com.yuvimasory', name: 'orange-extensions', version: '1.3.0'
compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.8.6'

testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.11.0-M2'
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.11.0-M2'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.11.0-M2'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.11.0-M2'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.11.0-M2'
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
testImplementation group: 'org.junit.platform', name: 'junit-platform-runner', version: '1.11.1'
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.11.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.11.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.11.1'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.11.1'
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '3.0'
testImplementation group: 'org.testfx', name: 'testfx-junit5', version: '4.0.18'
testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: '21.0.2'

Expand Down
14 changes: 7 additions & 7 deletions data/modern/wizards_of_the_coast/msrd/basics/modern_basics/modernbasics_abilities_class.lst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ Turn/Rebuke Outsiders CATEGORY:Special Ability TYPE:Special.Turning.Outsiders V

###Block: FX Class Abilities
# Ability Name Category of Ability Type Visible Special ABility Define Description Add Spell Lvl Modify VAR Allow Follower Allowed Companions Source Page
Brew Potion CATEGORY:Special Ability VISIBLE:NO DEFINE:BrewLevel|0 DESC:Brew a potion, level is set at time of creation... BONUS:VAR|BrewLevel|3 SOURCEPAGE:msrdadvancedclassesII
Maximize Spell CATEGORY:Special Ability VISIBLE:NO DESC:All variable,numeric effects of a spell automatically achieve their maximum values; treat any spell this is a pplied to as three higher for memorization purposes ADDSPELLLEVEL:3 SOURCEPAGE:msrdadvancedclassesII
Quicken Spell CATEGORY:Special Ability TYPE:Special VISIBLE:NO ADDSPELLLEVEL:4
Scribe Scroll CATEGORY:Special Ability VISIBLE:NO DESC:Create a scroll, level is set at time of creation... SOURCEPAGE:msrdadvancedclassesII
Scribe Tattoo CATEGORY:Special Ability VISIBLE:NO DESC:Create a tattoo, level is set at time of creation... SOURCEPAGE:msrdadvancedclassesII
Summon Familiar CATEGORY:Special Ability VISIBLE:NO SAB:Summon Familiar DEFINE:FamiliarLVL|0 FOLLOWERS:Familiar|1 COMPANIONLIST:Familiar|Bat,Cat,Ferret,Hawk,Owl,Rat,Snake (Tiny/Viper),Toad
Web Access Spells CATEGORY:Special Ability TYPE:VirtualPossession VISIBLE:NO SAB:Can use Web Access as spellbook
Brew Potion CATEGORY:Special Ability TYPE:SpecialQuality DEFINE:BrewLevel|0 DESC:Brew a potion, level is set at time of creation... BONUS:VAR|BrewLevel|3 SOURCEPAGE:msrdadvancedclassesII
Maximize Spell CATEGORY:Special Ability TYPE:SpecialQuality DESC:All variable,numeric effects of a spell automatically achieve their maximum values; treat any spell this is a pplied to as three higher for memorization purposes ADDSPELLLEVEL:3 SOURCEPAGE:msrdadvancedclassesII
Quicken Spell CATEGORY:Special Ability TYPE:SpecialQuality.Special ADDSPELLLEVEL:4
Scribe Scroll CATEGORY:Special Ability TYPE:SpecialQuality DESC:Create a scroll, level is set at time of creation... SOURCEPAGE:msrdadvancedclassesII
Scribe Tattoo CATEGORY:Special Ability TYPE:SpecialQuality DESC:Create a tattoo, level is set at time of creation... SOURCEPAGE:msrdadvancedclassesII
Summon Familiar CATEGORY:Special Ability TYPE:SpecialQuality DEFINE:FamiliarLVL|0 FOLLOWERS:Familiar|1 COMPANIONLIST:Familiar|Bat,Cat,Ferret,Hawk,Owl,Rat,Snake (Tiny/Viper),Toad
Web Access Spells CATEGORY:Special Ability TYPE:SpecialQuality.VirtualPossession DESC:Can use Web Access as spellbook

###Block: Artificer Craft Artifice Abilities
# Ability Name Category of Ability Type Visible Required Skill Special ABility
Expand Down
Loading

0 comments on commit 6b9ac12

Please sign in to comment.