[Pcgen-github] [PCGen/pcgen] 58d91e: Squashed commit of the following:

[GitHub <no...@gi...>]

  Branch: refs/heads/master
  Home:   https://github.com/PCGen/pcgen
  Commit: 58d91ebcd6a2401c6deb19ef71d2f6aa47dae876
      https://github.com/PCGen/pcgen/commit/58d91ebcd6a2401c6deb19ef71d2f6aa47dae876
  Author: LegacyKing <dre...@ya...>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M code/src/itest/pcgen/cdom/facet/StatIntegrationTest.java
    M code/src/itest/pcgen/io/testsupport/AbstractSaveRestoreTest.java
    M code/src/itest/plugin/lsttokens/editcontext/DefineIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/DefineStatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/deity/AlignIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/equipment/SizeIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/pcclass/BonusSpellStatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/pcclass/SpellStatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/race/SizeIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/skill/KeystatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/spell/StatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/template/SizeIntegrationTest.java
    M code/src/itest/tokenmodel/testsupport/AbstractTokenModelTest.java
    M code/src/java/gmgen/plugin/PcgCombatant.java
    M code/src/java/gmgen/plugin/PcgSystemInitiative.java
    M code/src/java/gmgen/plugin/PlayerCharacterOutput.java
    M code/src/java/gmgen/plugin/SystemHP.java
    M code/src/java/pcgen/cdom/base/CDOMObject.java
    M code/src/java/pcgen/cdom/enumeration/FormulaKey.java
    M code/src/java/pcgen/cdom/enumeration/ListKey.java
    M code/src/java/pcgen/cdom/enumeration/ObjectKey.java
    M code/src/java/pcgen/cdom/facet/StatCalcFacet.java
    M code/src/java/pcgen/cdom/facet/analysis/NonStatStatFacet.java
    M code/src/java/pcgen/cdom/facet/analysis/NonStatToStatFacet.java
    M code/src/java/pcgen/cdom/facet/analysis/UnlockedStatFacet.java
    M code/src/java/pcgen/cdom/facet/model/SizeFacet.java
    M code/src/java/pcgen/cdom/formula/FixedSizeFormula.java
    M code/src/java/pcgen/cdom/helper/StatLock.java
    M code/src/java/pcgen/cdom/reference/CDOMSimpleSingleRef.java
    M code/src/java/pcgen/core/BonusManager.java
    M code/src/java/pcgen/core/Deity.java
    M code/src/java/pcgen/core/Equipment.java
    M code/src/java/pcgen/core/EquipmentChoice.java
    M code/src/java/pcgen/core/EquipmentList.java
    M code/src/java/pcgen/core/GameMode.java
    M code/src/java/pcgen/core/PCAlignment.java
    M code/src/java/pcgen/core/PCClass.java
    M code/src/java/pcgen/core/PCStat.java
    M code/src/java/pcgen/core/PlayerCharacter.java
    M code/src/java/pcgen/core/SizeAdjustment.java
    M code/src/java/pcgen/core/Skill.java
    M code/src/java/pcgen/core/SpellSupportForPCClass.java
    M code/src/java/pcgen/core/analysis/AlignmentConverter.java
    M code/src/java/pcgen/core/analysis/BonusCalc.java
    M code/src/java/pcgen/core/analysis/SizeUtilities.java
    M code/src/java/pcgen/core/analysis/SkillInfoUtilities.java
    M code/src/java/pcgen/core/analysis/SkillModifier.java
    M code/src/java/pcgen/core/character/WieldCategory.java
    M code/src/java/pcgen/core/display/NonAbilityDisplay.java
    M code/src/java/pcgen/core/display/SkillCostDisplay.java
    M code/src/java/pcgen/core/display/TemplateModifier.java
    M code/src/java/pcgen/core/kit/KitAlignment.java
    M code/src/java/pcgen/core/kit/KitGear.java
    M code/src/java/pcgen/core/kit/KitStat.java
    M code/src/java/pcgen/core/npcgen/AlignGeneratorOption.java
    M code/src/java/pcgen/core/npcgen/ClassDataParser.java
    M code/src/java/pcgen/core/npcgen/Configuration.java
    M code/src/java/pcgen/core/npcgen/EquipmentItem.java
    M code/src/java/pcgen/core/npcgen/NPCGenerator.java
    M code/src/java/pcgen/core/pclevelinfo/PCLevelInfoStat.java
    M code/src/java/pcgen/core/system/LoadInfo.java
    M code/src/java/pcgen/core/term/EvaluatorFactory.java
    M code/src/java/pcgen/core/term/PCBaseSpellStatTermEvaluator.java
    M code/src/java/pcgen/core/term/PCSPellBaseStatScoreEvaluatorTermEvaluator.java
    M code/src/java/pcgen/core/term/PCSPellBaseStatTermEvaluator.java
    M code/src/java/pcgen/core/term/PCScoreTermEvaluator.java
    M code/src/java/pcgen/core/term/PCStatBaseTermEvaluator.java
    M code/src/java/pcgen/core/term/PCStatModTermEvaluator.java
    M code/src/java/pcgen/core/term/PCStatTotalTermEvaluator.java
    M code/src/java/pcgen/facade/core/StatFacade.java
    M code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
    M code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
    M code/src/java/pcgen/io/PCGVer2Creator.java
    M code/src/java/pcgen/io/PCGVer2Parser.java
    M code/src/java/pcgen/io/exporttoken/EqToken.java
    M code/src/java/pcgen/io/exporttoken/StatToken.java
    M code/src/java/pcgen/io/exporttoken/WeaponToken.java
    M code/src/java/pcgen/io/exporttoken/WeaponhToken.java
    M code/src/java/pcgen/persistence/GameModeFileLoader.java
    M code/src/java/pcgen/rules/context/AbstractReferenceContext.java
    M code/src/java/pcgen/rules/context/ReferenceContextUtilities.java
    R code/src/java/pcgen/rules/persistence/AbbreviatedCreator.java
    M code/src/java/plugin/bonustokens/LockedStat.java
    M code/src/java/plugin/bonustokens/Stat.java
    M code/src/java/plugin/exporttokens/AlignmentToken.java
    M code/src/java/plugin/exporttokens/DeityToken.java
    M code/src/java/plugin/exporttokens/SkillListModsToken.java
    M code/src/java/plugin/exporttokens/TemplateToken.java
    M code/src/java/plugin/initiative/gui/Initiative.java
    M code/src/java/plugin/lsttokens/DefineLst.java
    M code/src/java/plugin/lsttokens/DefineStatLst.java
    M code/src/java/plugin/lsttokens/NaturalattacksLst.java
    M code/src/java/plugin/lsttokens/choose/AlignmentToken.java
    M code/src/java/plugin/lsttokens/choose/PCStatToken.java
    M code/src/java/plugin/lsttokens/deity/AlignToken.java
    M code/src/java/plugin/lsttokens/equipment/SizeToken.java
    M code/src/java/plugin/lsttokens/equipmentmodifier/choose/StatBonusToken.java
    M code/src/java/plugin/lsttokens/kit/AlignToken.java
    M code/src/java/plugin/lsttokens/kit/StatToken.java
    M code/src/java/plugin/lsttokens/kit/gear/SizeToken.java
    M code/src/java/plugin/lsttokens/pcclass/BonusspellstatToken.java
    M code/src/java/plugin/lsttokens/pcclass/SpellstatToken.java
    M code/src/java/plugin/lsttokens/race/SizeToken.java
    M code/src/java/plugin/lsttokens/sizeadjustment/AbbToken.java
    M code/src/java/plugin/lsttokens/skill/KeystatToken.java
    M code/src/java/plugin/lsttokens/spell/StatToken.java
    M code/src/java/plugin/lsttokens/statsandchecks/alignment/AbbToken.java
    M code/src/java/plugin/lsttokens/statsandchecks/stat/AbbToken.java
    M code/src/java/plugin/lsttokens/template/SizeToken.java
    M code/src/java/plugin/pretokens/parser/PreAlignParser.java
    M code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java
    M code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java
    M code/src/java/plugin/pretokens/parser/PreSizeParser.java
    M code/src/java/plugin/pretokens/test/PreAlignTester.java
    M code/src/java/plugin/pretokens/test/PreBaseSizeTester.java
    M code/src/java/plugin/pretokens/test/PreDeityAlignTester.java
    M code/src/java/plugin/pretokens/test/PreStatTester.java
    M code/src/java/plugin/primitive/deity/AlignToken.java
    M code/src/java/plugin/primitive/race/BaseSizeToken.java
    M code/src/test/pcgen/AbstractCharacterTestCase.java
    M code/src/test/pcgen/AbstractJunit4CharacterTestCase.java
    M code/src/test/pcgen/core/ChallengeRatingPathfinderTest.java
    M code/src/test/pcgen/core/EquipmentListTest.java
    M code/src/test/pcgen/core/EquipmentTest.java
    M code/src/test/pcgen/core/EquipmentUtilitiesTest.java
    M code/src/test/pcgen/core/GlobalsTest.java
    M code/src/test/pcgen/core/PCClassTest.java
    M code/src/test/pcgen/core/PlayerCharacterSpellTest.java
    M code/src/test/pcgen/core/PlayerCharacterTest.java
    M code/src/test/pcgen/core/PrereqHandlerTest.java
    M code/src/test/pcgen/core/SizeAdjustmentTest.java
    M code/src/test/pcgen/core/StatListTest.java
    M code/src/test/pcgen/core/prereq/PreAlignTest.java
    M code/src/test/pcgen/core/prereq/PreBaseSizeTest.java
    M code/src/test/pcgen/core/prereq/PreClassTest.java
    M code/src/test/pcgen/core/prereq/PreDeityAlignTest.java
    M code/src/test/pcgen/core/prereq/PreDeityDomainTest.java
    M code/src/test/pcgen/core/prereq/PreDeityTest.java
    M code/src/test/pcgen/core/prereq/PreDomainTest.java
    M code/src/test/pcgen/core/prereq/PreEquipBothTest.java
    M code/src/test/pcgen/core/prereq/PreEquipPrimaryTest.java
    M code/src/test/pcgen/core/prereq/PreEquipSecondaryTest.java
    M code/src/test/pcgen/core/prereq/PreEquipTest.java
    M code/src/test/pcgen/core/prereq/PreEquipTwoWeaponTest.java
    M code/src/test/pcgen/core/prereq/PreHDTest.java
    M code/src/test/pcgen/core/prereq/PreMultTest.java
    M code/src/test/pcgen/core/prereq/PreSizeTest.java
    M code/src/test/pcgen/core/prereq/PreSpellDescriptorTest.java
    M code/src/test/pcgen/core/prereq/PreSpellSchoolTest.java
    M code/src/test/pcgen/core/prereq/PreSpellSubSchoolTest.java
    M code/src/test/pcgen/core/prereq/PreSpellTypeTest.java
    M code/src/test/pcgen/core/prereq/PreVarTest.java
    M code/src/test/pcgen/core/term/EvaluatorFactoryTest.java
    M code/src/test/pcgen/core/term/PCRacialHDSizeTermEvaluatorTest.java
    M code/src/test/pcgen/core/term/PCTLTermEvaluatorTest.java
    M code/src/test/pcgen/gui2/facade/CharacterLevelsFacadeImplTest.java
    M code/src/test/pcgen/io/ExportHandlerTest.java
    M code/src/test/pcgen/io/exporttoken/AbilityTokenTest.java
    M code/src/test/pcgen/io/exporttoken/SpellMemTokenTest.java
    M code/src/test/pcgen/io/exporttoken/WeaponTokenTest.java
    M code/src/test/pcgen/persistence/lst/PObjectLoaderTest.java
    M code/src/test/pcgen/persistence/lst/output/prereq/PrerequisiteWriterTest.java
    M code/src/test/pcgen/persistence/lst/prereq/PreParserFactoryTest.java
    M code/src/test/pcgen/util/TestHelper.java
    M code/src/test/plugin/exporttokens/SkillSitTokenTest.java
    M code/src/test/plugin/exporttokens/SkillTokenTest.java
    M code/src/test/plugin/exporttokens/VAbilityTokenTest.java
    M code/src/test/plugin/jepcommands/ClassLevelCommandTest.java
    A code/src/testcommon/plugin/lsttokens/testsupport/BuildUtilities.java
    M code/src/utest/actor/add/VFeatTokenTest.java
    M code/src/utest/actor/choose/AbilityTokenTest.java
    M code/src/utest/actor/testsupport/AbstractPersistentCDOMChoiceActorTestCase.java
    M code/src/utest/pcgen/cdom/facet/analysis/StatLockFacetTest.java
    M code/src/utest/pcgen/cdom/facet/analysis/UnlockedStatFacetTest.java
    M code/src/utest/pcgen/cdom/facet/model/SizeFacetTest.java
    M code/src/utest/pcgen/testsupport/AbstractCharacterUsingTestCase.java
    M code/src/utest/pcgen/testsupport/TestSupport.java
    M code/src/utest/plugin/lsttokens/DefineLstTest.java
    M code/src/utest/plugin/lsttokens/DefineStatLstTest.java
    M code/src/utest/plugin/lsttokens/choose/AlignmentTokenTest.java
    M code/src/utest/plugin/lsttokens/choose/PCStatTokenTest.java
    M code/src/utest/plugin/lsttokens/deity/AlignTokenTest.java
    M code/src/utest/plugin/lsttokens/equipment/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/kit/AlignTokenTest.java
    M code/src/utest/plugin/lsttokens/kit/StatTokenTest.java
    M code/src/utest/plugin/lsttokens/kit/gear/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/pcclass/AbbTokenTest.java
    M code/src/utest/plugin/lsttokens/pcclass/BonusSpellStatTokenTest.java
    M code/src/utest/plugin/lsttokens/pcclass/SpellStatTokenTest.java
    M code/src/utest/plugin/lsttokens/race/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/sizeadjustment/AbbTokenTest.java
    M code/src/utest/plugin/lsttokens/skill/KeystatTokenTest.java
    M code/src/utest/plugin/lsttokens/spell/StatTokenTest.java
    M code/src/utest/plugin/lsttokens/template/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/testsupport/AbstractQualifierTokenTestCase.java
    M code/src/utest/plugin/pretokens/AbstractAlignRoundRobin.java
    M code/src/utest/plugin/pretokens/AbstractPreRoundRobin.java
    M code/src/utest/plugin/pretokens/PreBaseSizeRoundRobin.java
    M code/src/utest/plugin/pretokens/PreSizeRoundRobin.java
    M code/src/utest/plugin/primitive/deity/AlignTokenTest.java
    M code/src/utest/plugin/primitive/race/BaseSizeTokenTest.java
    M system/gameModes/35e/load.lst
    M system/gameModes/35e/sizeAdjustment.lst
    M system/gameModes/3e/load.lst
    M system/gameModes/3e/sizeAdjustment.lst
    M system/gameModes/3e/statsandchecks.lst
    M system/gameModes/Darwins_World_2/load.lst
    M system/gameModes/Darwins_World_2/sizeAdjustment.lst
    M system/gameModes/Darwins_World_2/statsandchecks.lst
    M system/gameModes/Deadlands/load.lst
    M system/gameModes/Deadlands/sizeAdjustment.lst
    M system/gameModes/Deadlands/statsandchecks.lst
    M system/gameModes/Fantasy_Craft/sizeAdjustment.lst
    M system/gameModes/Fantasy_Craft/statsandchecks.lst
    M system/gameModes/Gaslight/load.lst
    M system/gameModes/Gaslight/sizeAdjustment.lst
    M system/gameModes/Immortal/statsandchecks.lst
    M system/gameModes/Killshot/sizeAdjustment.lst
    M system/gameModes/Killshot/statsandchecks.lst
    M system/gameModes/Legends_of_Excalibur/load.lst
    M system/gameModes/Legends_of_Excalibur/sizeAdjustment.lst
    M system/gameModes/Legends_of_Excalibur/statsandchecks.lst
    M system/gameModes/Modern/load.lst
    M system/gameModes/Modern/sizeAdjustment.lst
    M system/gameModes/Modern/statsandchecks.lst
    M system/gameModes/OSRIC/load.lst
    M system/gameModes/OSRIC/sizeAdjustment.lst
    M system/gameModes/Pathfinder/load.lst
    M system/gameModes/Pathfinder_PFS/load.lst
    M system/gameModes/Pathfinder_PFS/sizeAdjustment.lst
    M system/gameModes/Sidewinder/load.lst
    M system/gameModes/Sidewinder/sizeAdjustment.lst
    M system/gameModes/Sidewinder/statsandchecks.lst
    M system/gameModes/Spycraft/load.lst
    M system/gameModes/Spycraft/sizeAdjustment.lst
    M system/gameModes/Spycraft/statsandchecks.lst
    M system/gameModes/Xcrawl/load.lst
    M system/gameModes/Xcrawl/sizeAdjustment.lst
    M system/gameModes/Xcrawl/statsandchecks.lst
    M system/gameModes/default/load.lst
    M system/gameModes/default/sizeAdjustment.lst
    M system/gameModes/zen_test/load.lst
    M system/gameModes/zen_test/sizeAdjustment.lst
    M system/gameModes/zen_test/statsandchecks.lst

  Log Message:
  -----------
  Squashed commit of the following:

commit e2bd1a0670e79ad646a3da30d08a3ba73cb5f12b
Author: LegacyKing <dre...@ya...>
Date:   Fri Jan 23 15:20:49 2015 -0800

    NEWTAG-476
    sizeAdjustment.lst updates
    Fix the ABB tag

commit d359b1477563870317938c81d6fa3f726bf0c5c3
Author: LegacyKing <dre...@ya...>
Date:   Fri Jan 23 15:12:53 2015 -0800

    NEWTAG-476
    load.lst updates

commit fd297258d77cc22c10a8efcc0c4ce7e622dce971
Author: LegacyKing <dre...@ya...>
Date:   Fri Jan 23 15:03:40 2015 -0800

    NEWTAG-476
    sizeAdjustment.lst updates

commit e7972770d9340ca368bd40338705e0ab8225ede2
Author: Tom Parker <th...@ya...>
Date:   Fri Jan 23 16:07:21 2015 -0500

    NEWTAG-476
    - Minor bug fixes
    - Clarify method of deprecation on PREBASESIZE

commit 95bb2bec64d7ef78facedff363faf0c59767bfca
Author: LegacyKing <dre...@ya...>
Date:   Fri Jan 23 14:42:22 2015 -0800

    NEWTAG-476
    Add KEY along with ABB.

commit 06ea01555b42046c8353b2efbf2847610357e123
Author: Tom Parker <th...@ya...>
Date:   Tue Jan 20 20:24:39 2015 -0500

    NEWTAG-476
    Make PRE*SIZE consistent in handling key

commit 3eabec7a0a38187cf5a6a9aec362f0fbb2a22504
Merge: e01e745 c242f6b
Author: Tom Parker <th...@ya...>
Date:   Sun Jan 18 22:36:47 2015 -0500

    Merge branch 'NEWTAG-476' of https://github.com/thpr/pcgen into NEWTAG-476

commit e01e7456899fac2e310ae71e7e085a4034a1d3cf
Author: Tom Parker <th...@ya...>
Date:   Sun Jan 18 22:21:33 2015 -0500

    NEWTAG-476
    - Remove special abbreviation behavior, all objects use KEY

commit c242f6b2b46a412cd561871db0a36810ea67f6ed
Author: Tom Parker <th...@ya...>
Date:   Sun Jan 18 22:21:33 2015 -0500

    NEWTAG-476
    - Remove special abbreviation behavior, all objects use KEY


  Commit: f93449a9d5524684110b49d55ac310e51e4e6932
      https://github.com/PCGen/pcgen/commit/f93449a9d5524684110b49d55ac310e51e4e6932
  Author: Tom Parker <th...@ya...>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M code/src/itest/plugin/lsttokens/editcontext/add/LanguageIntegrationTest.java
    A code/src/java/pcgen/cdom/base/Ungranted.java
    M code/src/java/pcgen/core/ArmorProf.java
    M code/src/java/pcgen/core/Language.java
    M code/src/java/pcgen/core/ShieldProf.java
    M code/src/java/plugin/lsttokens/AbilityLst.java
    M code/src/java/plugin/lsttokens/AddLst.java
    M code/src/java/plugin/lsttokens/AutoLst.java
    M code/src/java/plugin/lsttokens/BonusLst.java
    M code/src/java/plugin/lsttokens/CcskillLst.java
    M code/src/java/plugin/lsttokens/ChangeprofLst.java
    M code/src/java/plugin/lsttokens/ChooseLst.java
    M code/src/java/plugin/lsttokens/CompanionListLst.java
    M code/src/java/plugin/lsttokens/CskillLst.java
    M code/src/java/plugin/lsttokens/DefineLst.java
    M code/src/java/plugin/lsttokens/DefineStatLst.java
    M code/src/java/plugin/lsttokens/DescLst.java
    M code/src/java/plugin/lsttokens/DrLst.java
    M code/src/java/plugin/lsttokens/FollowersLst.java
    M code/src/java/plugin/lsttokens/KitLst.java
    M code/src/java/plugin/lsttokens/MoveLst.java
    M code/src/java/plugin/lsttokens/MovecloneLst.java
    M code/src/java/plugin/lsttokens/NaturalattacksLst.java
    M code/src/java/plugin/lsttokens/QualifyToken.java
    M code/src/java/plugin/lsttokens/RegionLst.java
    M code/src/java/plugin/lsttokens/RemoveLst.java
    M code/src/java/plugin/lsttokens/SabLst.java
    M code/src/java/plugin/lsttokens/SelectLst.java
    M code/src/java/plugin/lsttokens/SpellknownLst.java
    M code/src/java/plugin/lsttokens/SpelllevelLst.java
    M code/src/java/plugin/lsttokens/SpellsLst.java
    M code/src/java/plugin/lsttokens/SrLst.java
    M code/src/java/plugin/lsttokens/TempBonusLst.java
    M code/src/java/plugin/lsttokens/TempdescLst.java
    M code/src/java/plugin/lsttokens/TemplateLst.java
    M code/src/java/plugin/lsttokens/UdamLst.java
    M code/src/java/plugin/lsttokens/UmultLst.java
    M code/src/java/plugin/lsttokens/UnencumberedmoveLst.java
    M code/src/java/plugin/lsttokens/VFeatLst.java
    M code/src/java/plugin/lsttokens/VisionLst.java

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/PCGen/pcgen into NEWTAG-476D

Conflicts:
	code/src/java/plugin/lsttokens/DefineLst.java


  Commit: ac66991e447eed9539ab39a80e936da601695907
      https://github.com/PCGen/pcgen/commit/ac66991e447eed9539ab39a80e936da601695907
  Author: Tom Parker <th...@ya...>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java
    M code/src/java/plugin/pretokens/parser/PreSizeParser.java

  Log Message:
  -----------
  NEWTAG-476
- Fix message in PRE*SIZE tokens


  Commit: 43f4993644d88c661e0d91dd8bd43700c2ab8ec8
      https://github.com/PCGen/pcgen/commit/43f4993644d88c661e0d91dd8bd43700c2ab8ec8
  Author: jdempsey-au <jam...@gm...>
  Date:   2015-01-24 (Sat, 24 Jan 2015)

  Changed paths:
    M code/src/itest/pcgen/cdom/facet/StatIntegrationTest.java
    M code/src/itest/pcgen/io/testsupport/AbstractSaveRestoreTest.java
    M code/src/itest/plugin/lsttokens/editcontext/DefineIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/DefineStatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/deity/AlignIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/equipment/SizeIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/pcclass/BonusSpellStatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/pcclass/SpellStatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/race/SizeIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/skill/KeystatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/spell/StatIntegrationTest.java
    M code/src/itest/plugin/lsttokens/editcontext/template/SizeIntegrationTest.java
    M code/src/itest/tokenmodel/testsupport/AbstractTokenModelTest.java
    M code/src/java/gmgen/plugin/PcgCombatant.java
    M code/src/java/gmgen/plugin/PcgSystemInitiative.java
    M code/src/java/gmgen/plugin/PlayerCharacterOutput.java
    M code/src/java/gmgen/plugin/SystemHP.java
    M code/src/java/pcgen/cdom/base/CDOMObject.java
    M code/src/java/pcgen/cdom/enumeration/FormulaKey.java
    M code/src/java/pcgen/cdom/enumeration/ListKey.java
    M code/src/java/pcgen/cdom/enumeration/ObjectKey.java
    M code/src/java/pcgen/cdom/facet/StatCalcFacet.java
    M code/src/java/pcgen/cdom/facet/analysis/NonStatStatFacet.java
    M code/src/java/pcgen/cdom/facet/analysis/NonStatToStatFacet.java
    M code/src/java/pcgen/cdom/facet/analysis/UnlockedStatFacet.java
    M code/src/java/pcgen/cdom/facet/model/SizeFacet.java
    M code/src/java/pcgen/cdom/formula/FixedSizeFormula.java
    M code/src/java/pcgen/cdom/helper/StatLock.java
    M code/src/java/pcgen/cdom/reference/CDOMSimpleSingleRef.java
    M code/src/java/pcgen/core/BonusManager.java
    M code/src/java/pcgen/core/Deity.java
    M code/src/java/pcgen/core/Equipment.java
    M code/src/java/pcgen/core/EquipmentChoice.java
    M code/src/java/pcgen/core/EquipmentList.java
    M code/src/java/pcgen/core/GameMode.java
    M code/src/java/pcgen/core/PCAlignment.java
    M code/src/java/pcgen/core/PCClass.java
    M code/src/java/pcgen/core/PCStat.java
    M code/src/java/pcgen/core/PlayerCharacter.java
    M code/src/java/pcgen/core/SizeAdjustment.java
    M code/src/java/pcgen/core/Skill.java
    M code/src/java/pcgen/core/SpellSupportForPCClass.java
    M code/src/java/pcgen/core/analysis/AlignmentConverter.java
    M code/src/java/pcgen/core/analysis/BonusCalc.java
    M code/src/java/pcgen/core/analysis/SizeUtilities.java
    M code/src/java/pcgen/core/analysis/SkillInfoUtilities.java
    M code/src/java/pcgen/core/analysis/SkillModifier.java
    M code/src/java/pcgen/core/character/WieldCategory.java
    M code/src/java/pcgen/core/display/NonAbilityDisplay.java
    M code/src/java/pcgen/core/display/SkillCostDisplay.java
    M code/src/java/pcgen/core/display/TemplateModifier.java
    M code/src/java/pcgen/core/kit/KitAlignment.java
    M code/src/java/pcgen/core/kit/KitGear.java
    M code/src/java/pcgen/core/kit/KitStat.java
    M code/src/java/pcgen/core/npcgen/AlignGeneratorOption.java
    M code/src/java/pcgen/core/npcgen/ClassDataParser.java
    M code/src/java/pcgen/core/npcgen/Configuration.java
    M code/src/java/pcgen/core/npcgen/EquipmentItem.java
    M code/src/java/pcgen/core/npcgen/NPCGenerator.java
    M code/src/java/pcgen/core/pclevelinfo/PCLevelInfoStat.java
    M code/src/java/pcgen/core/system/LoadInfo.java
    M code/src/java/pcgen/core/term/EvaluatorFactory.java
    M code/src/java/pcgen/core/term/PCBaseSpellStatTermEvaluator.java
    M code/src/java/pcgen/core/term/PCSPellBaseStatScoreEvaluatorTermEvaluator.java
    M code/src/java/pcgen/core/term/PCSPellBaseStatTermEvaluator.java
    M code/src/java/pcgen/core/term/PCScoreTermEvaluator.java
    M code/src/java/pcgen/core/term/PCStatBaseTermEvaluator.java
    M code/src/java/pcgen/core/term/PCStatModTermEvaluator.java
    M code/src/java/pcgen/core/term/PCStatTotalTermEvaluator.java
    M code/src/java/pcgen/facade/core/StatFacade.java
    M code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
    M code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java
    M code/src/java/pcgen/io/PCGVer2Creator.java
    M code/src/java/pcgen/io/PCGVer2Parser.java
    M code/src/java/pcgen/io/exporttoken/EqToken.java
    M code/src/java/pcgen/io/exporttoken/StatToken.java
    M code/src/java/pcgen/io/exporttoken/WeaponToken.java
    M code/src/java/pcgen/io/exporttoken/WeaponhToken.java
    M code/src/java/pcgen/persistence/GameModeFileLoader.java
    M code/src/java/pcgen/rules/context/AbstractReferenceContext.java
    M code/src/java/pcgen/rules/context/ReferenceContextUtilities.java
    R code/src/java/pcgen/rules/persistence/AbbreviatedCreator.java
    M code/src/java/plugin/bonustokens/LockedStat.java
    M code/src/java/plugin/bonustokens/Stat.java
    M code/src/java/plugin/exporttokens/AlignmentToken.java
    M code/src/java/plugin/exporttokens/DeityToken.java
    M code/src/java/plugin/exporttokens/SkillListModsToken.java
    M code/src/java/plugin/exporttokens/TemplateToken.java
    M code/src/java/plugin/initiative/gui/Initiative.java
    M code/src/java/plugin/lsttokens/DefineLst.java
    M code/src/java/plugin/lsttokens/DefineStatLst.java
    M code/src/java/plugin/lsttokens/NaturalattacksLst.java
    M code/src/java/plugin/lsttokens/choose/AlignmentToken.java
    M code/src/java/plugin/lsttokens/choose/PCStatToken.java
    M code/src/java/plugin/lsttokens/deity/AlignToken.java
    M code/src/java/plugin/lsttokens/equipment/SizeToken.java
    M code/src/java/plugin/lsttokens/equipmentmodifier/choose/StatBonusToken.java
    M code/src/java/plugin/lsttokens/kit/AlignToken.java
    M code/src/java/plugin/lsttokens/kit/StatToken.java
    M code/src/java/plugin/lsttokens/kit/gear/SizeToken.java
    M code/src/java/plugin/lsttokens/pcclass/BonusspellstatToken.java
    M code/src/java/plugin/lsttokens/pcclass/SpellstatToken.java
    M code/src/java/plugin/lsttokens/race/SizeToken.java
    M code/src/java/plugin/lsttokens/sizeadjustment/AbbToken.java
    M code/src/java/plugin/lsttokens/skill/KeystatToken.java
    M code/src/java/plugin/lsttokens/spell/StatToken.java
    M code/src/java/plugin/lsttokens/statsandchecks/alignment/AbbToken.java
    M code/src/java/plugin/lsttokens/statsandchecks/stat/AbbToken.java
    M code/src/java/plugin/lsttokens/template/SizeToken.java
    M code/src/java/plugin/pretokens/parser/PreAlignParser.java
    M code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java
    M code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java
    M code/src/java/plugin/pretokens/parser/PreSizeParser.java
    M code/src/java/plugin/pretokens/test/PreAlignTester.java
    M code/src/java/plugin/pretokens/test/PreBaseSizeTester.java
    M code/src/java/plugin/pretokens/test/PreDeityAlignTester.java
    M code/src/java/plugin/pretokens/test/PreStatTester.java
    M code/src/java/plugin/primitive/deity/AlignToken.java
    M code/src/java/plugin/primitive/race/BaseSizeToken.java
    M code/src/test/pcgen/AbstractCharacterTestCase.java
    M code/src/test/pcgen/AbstractJunit4CharacterTestCase.java
    M code/src/test/pcgen/core/ChallengeRatingPathfinderTest.java
    M code/src/test/pcgen/core/EquipmentListTest.java
    M code/src/test/pcgen/core/EquipmentTest.java
    M code/src/test/pcgen/core/EquipmentUtilitiesTest.java
    M code/src/test/pcgen/core/GlobalsTest.java
    M code/src/test/pcgen/core/PCClassTest.java
    M code/src/test/pcgen/core/PlayerCharacterSpellTest.java
    M code/src/test/pcgen/core/PlayerCharacterTest.java
    M code/src/test/pcgen/core/PrereqHandlerTest.java
    M code/src/test/pcgen/core/SizeAdjustmentTest.java
    M code/src/test/pcgen/core/StatListTest.java
    M code/src/test/pcgen/core/prereq/PreAlignTest.java
    M code/src/test/pcgen/core/prereq/PreBaseSizeTest.java
    M code/src/test/pcgen/core/prereq/PreClassTest.java
    M code/src/test/pcgen/core/prereq/PreDeityAlignTest.java
    M code/src/test/pcgen/core/prereq/PreDeityDomainTest.java
    M code/src/test/pcgen/core/prereq/PreDeityTest.java
    M code/src/test/pcgen/core/prereq/PreDomainTest.java
    M code/src/test/pcgen/core/prereq/PreEquipBothTest.java
    M code/src/test/pcgen/core/prereq/PreEquipPrimaryTest.java
    M code/src/test/pcgen/core/prereq/PreEquipSecondaryTest.java
    M code/src/test/pcgen/core/prereq/PreEquipTest.java
    M code/src/test/pcgen/core/prereq/PreEquipTwoWeaponTest.java
    M code/src/test/pcgen/core/prereq/PreHDTest.java
    M code/src/test/pcgen/core/prereq/PreMultTest.java
    M code/src/test/pcgen/core/prereq/PreSizeTest.java
    M code/src/test/pcgen/core/prereq/PreSpellDescriptorTest.java
    M code/src/test/pcgen/core/prereq/PreSpellSchoolTest.java
    M code/src/test/pcgen/core/prereq/PreSpellSubSchoolTest.java
    M code/src/test/pcgen/core/prereq/PreSpellTypeTest.java
    M code/src/test/pcgen/core/prereq/PreVarTest.java
    M code/src/test/pcgen/core/term/EvaluatorFactoryTest.java
    M code/src/test/pcgen/core/term/PCRacialHDSizeTermEvaluatorTest.java
    M code/src/test/pcgen/core/term/PCTLTermEvaluatorTest.java
    M code/src/test/pcgen/gui2/facade/CharacterLevelsFacadeImplTest.java
    M code/src/test/pcgen/io/ExportHandlerTest.java
    M code/src/test/pcgen/io/exporttoken/AbilityTokenTest.java
    M code/src/test/pcgen/io/exporttoken/SpellMemTokenTest.java
    M code/src/test/pcgen/io/exporttoken/WeaponTokenTest.java
    M code/src/test/pcgen/persistence/lst/PObjectLoaderTest.java
    M code/src/test/pcgen/persistence/lst/output/prereq/PrerequisiteWriterTest.java
    M code/src/test/pcgen/persistence/lst/prereq/PreParserFactoryTest.java
    M code/src/test/pcgen/util/TestHelper.java
    M code/src/test/plugin/exporttokens/SkillSitTokenTest.java
    M code/src/test/plugin/exporttokens/SkillTokenTest.java
    M code/src/test/plugin/exporttokens/VAbilityTokenTest.java
    M code/src/test/plugin/jepcommands/ClassLevelCommandTest.java
    A code/src/testcommon/plugin/lsttokens/testsupport/BuildUtilities.java
    M code/src/utest/actor/add/VFeatTokenTest.java
    M code/src/utest/actor/choose/AbilityTokenTest.java
    M code/src/utest/actor/testsupport/AbstractPersistentCDOMChoiceActorTestCase.java
    M code/src/utest/pcgen/cdom/facet/analysis/StatLockFacetTest.java
    M code/src/utest/pcgen/cdom/facet/analysis/UnlockedStatFacetTest.java
    M code/src/utest/pcgen/cdom/facet/model/SizeFacetTest.java
    M code/src/utest/pcgen/testsupport/AbstractCharacterUsingTestCase.java
    M code/src/utest/pcgen/testsupport/TestSupport.java
    M code/src/utest/plugin/lsttokens/DefineLstTest.java
    M code/src/utest/plugin/lsttokens/DefineStatLstTest.java
    M code/src/utest/plugin/lsttokens/choose/AlignmentTokenTest.java
    M code/src/utest/plugin/lsttokens/choose/PCStatTokenTest.java
    M code/src/utest/plugin/lsttokens/deity/AlignTokenTest.java
    M code/src/utest/plugin/lsttokens/equipment/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/kit/AlignTokenTest.java
    M code/src/utest/plugin/lsttokens/kit/StatTokenTest.java
    M code/src/utest/plugin/lsttokens/kit/gear/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/pcclass/AbbTokenTest.java
    M code/src/utest/plugin/lsttokens/pcclass/BonusSpellStatTokenTest.java
    M code/src/utest/plugin/lsttokens/pcclass/SpellStatTokenTest.java
    M code/src/utest/plugin/lsttokens/race/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/sizeadjustment/AbbTokenTest.java
    M code/src/utest/plugin/lsttokens/skill/KeystatTokenTest.java
    M code/src/utest/plugin/lsttokens/spell/StatTokenTest.java
    M code/src/utest/plugin/lsttokens/template/SizeTokenTest.java
    M code/src/utest/plugin/lsttokens/testsupport/AbstractQualifierTokenTestCase.java
    M code/src/utest/plugin/pretokens/AbstractAlignRoundRobin.java
    M code/src/utest/plugin/pretokens/AbstractPreRoundRobin.java
    M code/src/utest/plugin/pretokens/PreBaseSizeRoundRobin.java
    M code/src/utest/plugin/pretokens/PreSizeRoundRobin.java
    M code/src/utest/plugin/primitive/deity/AlignTokenTest.java
    M code/src/utest/plugin/primitive/race/BaseSizeTokenTest.java
    M system/gameModes/35e/load.lst
    M system/gameModes/35e/sizeAdjustment.lst
    M system/gameModes/3e/load.lst
    M system/gameModes/3e/sizeAdjustment.lst
    M system/gameModes/3e/statsandchecks.lst
    M system/gameModes/Darwins_World_2/load.lst
    M system/gameModes/Darwins_World_2/sizeAdjustment.lst
    M system/gameModes/Darwins_World_2/statsandchecks.lst
    M system/gameModes/Deadlands/load.lst
    M system/gameModes/Deadlands/sizeAdjustment.lst
    M system/gameModes/Deadlands/statsandchecks.lst
    M system/gameModes/Fantasy_Craft/sizeAdjustment.lst
    M system/gameModes/Fantasy_Craft/statsandchecks.lst
    M system/gameModes/Gaslight/load.lst
    M system/gameModes/Gaslight/sizeAdjustment.lst
    M system/gameModes/Immortal/statsandchecks.lst
    M system/gameModes/Killshot/sizeAdjustment.lst
    M system/gameModes/Killshot/statsandchecks.lst
    M system/gameModes/Legends_of_Excalibur/load.lst
    M system/gameModes/Legends_of_Excalibur/sizeAdjustment.lst
    M system/gameModes/Legends_of_Excalibur/statsandchecks.lst
    M system/gameModes/Modern/load.lst
    M system/gameModes/Modern/sizeAdjustment.lst
    M system/gameModes/Modern/statsandchecks.lst
    M system/gameModes/OSRIC/load.lst
    M system/gameModes/OSRIC/sizeAdjustment.lst
    M system/gameModes/Pathfinder/load.lst
    M system/gameModes/Pathfinder_PFS/load.lst
    M system/gameModes/Pathfinder_PFS/sizeAdjustment.lst
    M system/gameModes/Sidewinder/load.lst
    M system/gameModes/Sidewinder/sizeAdjustment.lst
    M system/gameModes/Sidewinder/statsandchecks.lst
    M system/gameModes/Spycraft/load.lst
    M system/gameModes/Spycraft/sizeAdjustment.lst
    M system/gameModes/Spycraft/statsandchecks.lst
    M system/gameModes/Xcrawl/load.lst
    M system/gameModes/Xcrawl/sizeAdjustment.lst
    M system/gameModes/Xcrawl/statsandchecks.lst
    M system/gameModes/default/load.lst
    M system/gameModes/default/sizeAdjustment.lst
    M system/gameModes/zen_test/load.lst
    M system/gameModes/zen_test/sizeAdjustment.lst
    M system/gameModes/zen_test/statsandchecks.lst

  Log Message:
  -----------
  Merge pull request #107 from LegacyKing/NEWTAG-476D

NEWTAG-476


Compare: https://github.com/PCGen/pcgen/compare/48cd86ca8016...43f4993644d8