Menu
▾
▴
[Pcgen-github] [PCGen/pcgen] 7382b9: CODE-2807
|
From: GitHub <no...@gi...> - 2015-01-20 06:56:03
|
Branch: refs/heads/master Home: https://github.com/PCGen/pcgen Commit: 7382b9f6042c1e36782bbd88180335fdd99fd3d3 https://github.com/PCGen/pcgen/commit/7382b9f6042c1e36782bbd88180335fdd99fd3d3 Author: Tom Parker <th...@ya...> Date: 2015-01-17 (Sat, 17 Jan 2015) Changed paths: M code/src/java/pcgen/persistence/lst/CampaignSourceEntry.java A code/src/java/pcgen/persistence/lst/URIEntry.java A code/src/java/pcgen/persistence/lst/URIFactory.java M code/src/java/pcgen/rules/persistence/CDOMKitLoader.java M code/src/java/plugin/lsttokens/equipment/IconToken.java M code/src/utest/plugin/lsttokens/testsupport/CDOMTokenLoader.java Log Message: ----------- CODE-2807 Split up CampaignSourceEntry Commit: 2a90b133a6fb5cb4957a482aa5b4e05d70d79f10 https://github.com/PCGen/pcgen/commit/2a90b133a6fb5cb4957a482aa5b4e05d70d79f10 Author: Tom Parker <th...@ya...> Date: 2015-01-17 (Sat, 17 Jan 2015) Changed paths: M .gitignore M code/src/java/pcgen/resources/prop/PCGenProp.properties M code/src/java/pcgen/util/JepCountType.java M data/pathfinder/alluria_publishing/remarkable_races/rr_classes.lst M data/pathfinder/dreamscarred_press/ultimate_psionics/up_classes.lst M data/pathfinder/paizo/campaign_setting/dark_markets/dm_classes.lst M data/pathfinder/paizo/campaign_setting/inner_sea_world_guide/iswg_classes.lst M data/pathfinder/paizo/campaign_setting/seekers_of_secrets/sos_classes.lst M data/pathfinder/paizo/player_companion/animal_archive/anar_abilities_class.lst M data/pathfinder/paizo/player_companion/qadira_gateway_to_the_east/qgtte_classes.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/advanced_players_guide.pcc M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_abilities.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_abilities_class.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_classes.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_spells.lst M data/pathfinder/paizo/roleplaying_game/core_essentials/ce_skills.lst M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilitycategories.lst M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_classes.lst M data/pathfinder/paizo/roleplaying_game/mythic_adventures/ma_abilities.lst M data/pathfinder/paizo/roleplaying_game/mythic_adventures/ma_equipmods.lst M data/pathfinder/paizo/roleplaying_game/ultimate_campaign/_ultimate_campaign.pcc A data/pathfinder_pfs/paizo/campaign_setting/pfs_inner_sea_bestiary/pfs_inner_sea_bestiary.pcc M data/pathfinder_pfs/paizo/pathfinder_society/organized_play/_guide_to_pathfinder_society_organized_play.pcc M data/pathfinder_pfs/paizo/pathfinder_society/pathfinder_society_complete.pcc M data/pathfinder_pfs/paizo/pathfinder_society/pathfinder_society_core_assumption.pcc M data/pathfinder_pfs/paizo/pathfinder_society/pfs_chronicle_sheets/pfs_chronicle_sheets.pcc M docs/acknowledgments/contributors.html M installers/mac-installer/text/Read Me.rtfd/TXT.rtf M outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm M outputsheets/4e/4e/htmlxml/csheet_statblock_4e.htm M outputsheets/base.xml M outputsheets/base.xml.ftl M outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml.ftl M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_rpgwebprofiler.xml M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_pathfinder.htm.ftl M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm M outputsheets/d20/fantasy/text/csheet_InitTool_1.0.b23.rpgrp M outputsheets/d20/fantasy/text/csheet_PaizoForum.TXT M outputsheets/d20/fantasy/text/csheet_plain.TXT M outputsheets/d20/fantasy_craft/htmlxml/csheet_fantasy_craft_std.htm M outputsheets/d20/fantasy_craft/htmlxml/csheet_fantasycraft_std.htm M outputsheets/d20/modern/htmlxml/csheet_modern_rpgwebprofiler.xml M outputsheets/d20/modern/htmlxml/csheet_modern_statblock1.htm M outputsheets/d20/modern/htmlxml/csheet_modern_std.htm M outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm M outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm M outputsheets/d20/western/htmlxml/csheetSidewinder.htm M outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm M outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_statblock.htm M outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT M preview/d20/fantasy/Fantasy_Character_Sheet.html M preview/d20/fantasy/Standard.htm.ftl M preview/d20/fantasy/compact.htm M preview/d20/fantasy/preview.html M preview/d20/fantasy/statblock4.htm M preview/d20/fantasy/statblock5.htm M preview/d20/fantasy/statblock_SRD.htm M preview/d20/fantasy_craft/Fantasy_Craft.htm M preview/d20/fantasy_craft/troubleshooting.htm M preview/d20/gaslight/gaslight_statblock.htm M preview/d20/gaslight/preview.html M preview/d20/homebrew/Standard_homebrew.htm M preview/d20/modern/spycraft_std.htm M preview/d20/modern/standard.htm M preview/d20/modern/statblock1.htm M preview/d20/modern/troubleshooting.htm M preview/d20/sciencefiction/dw2_standard.htm M preview/d20/sciencefiction/dw2_statblock2.htm M preview/d20/western/Deadlands.htm M preview/d20/western/Sidewinder.htm Log Message: ----------- Merge branch 'master' of https://github.com/PCGen/pcgen Commit: 41636c242d63a2a73c53df2564f3ffaa7f13d40d https://github.com/PCGen/pcgen/commit/41636c242d63a2a73c53df2564f3ffaa7f13d40d Author: Tom Parker <th...@ya...> Date: 2015-01-19 (Mon, 19 Jan 2015) Changed paths: M .gitignore M code/src/java/pcgen/persistence/lst/CampaignSourceEntry.java M code/src/java/pcgen/resources/prop/PCGenProp.properties M code/src/java/pcgen/rules/persistence/CDOMKitLoader.java M code/src/java/pcgen/rules/persistence/CDOMLoader.java M code/src/java/pcgen/util/JepCountType.java M code/src/utest/plugin/lsttokens/testsupport/CDOMTokenLoader.java M data/pathfinder/alluria_publishing/remarkable_races/rr_classes.lst M data/pathfinder/dreamscarred_press/ultimate_psionics/up_classes.lst M data/pathfinder/paizo/campaign_setting/dark_markets/dm_classes.lst M data/pathfinder/paizo/campaign_setting/inner_sea_world_guide/iswg_classes.lst M data/pathfinder/paizo/campaign_setting/seekers_of_secrets/sos_classes.lst M data/pathfinder/paizo/player_companion/animal_archive/anar_abilities_class.lst M data/pathfinder/paizo/player_companion/qadira_gateway_to_the_east/qgtte_classes.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/advanced_players_guide.pcc M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_abilities.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_abilities_class.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_classes.lst M data/pathfinder/paizo/roleplaying_game/advanced_players_guide/apg_spells.lst M data/pathfinder/paizo/roleplaying_game/core_essentials/ce_skills.lst M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_abilitycategories.lst M data/pathfinder/paizo/roleplaying_game/core_rulebook/cr_classes.lst M data/pathfinder/paizo/roleplaying_game/mythic_adventures/ma_abilities.lst M data/pathfinder/paizo/roleplaying_game/mythic_adventures/ma_equipmods.lst M data/pathfinder/paizo/roleplaying_game/ultimate_campaign/_ultimate_campaign.pcc A data/pathfinder_pfs/paizo/campaign_setting/pfs_inner_sea_bestiary/pfs_inner_sea_bestiary.pcc M data/pathfinder_pfs/paizo/pathfinder_society/organized_play/_guide_to_pathfinder_society_organized_play.pcc M data/pathfinder_pfs/paizo/pathfinder_society/pathfinder_society_complete.pcc M data/pathfinder_pfs/paizo/pathfinder_society/pathfinder_society_core_assumption.pcc M data/pathfinder_pfs/paizo/pathfinder_society/pfs_chronicle_sheets/pfs_chronicle_sheets.pcc M docs/acknowledgments/contributors.html M installers/mac-installer/text/Read Me.rtfd/TXT.rtf M outputsheets/4e/4e/htmlxml/csheet_standard_4e.htm M outputsheets/4e/4e/htmlxml/csheet_statblock_4e.htm M outputsheets/base.xml M outputsheets/base.xml.ftl M outputsheets/d20/fantasy/htmlxml/csheet_FantasyGrounds2_pc_3.5.xml M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_generic_export.xml.ftl M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_rpgwebprofiler.xml M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock1.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock4.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock5.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_SRD.htm M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_statblock_pathfinder.htm.ftl M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_std.htm.ftl M outputsheets/d20/fantasy/htmlxml/csheet_fantasy_troubleshooting.htm M outputsheets/d20/fantasy/text/csheet_InitTool_1.0.b23.rpgrp M outputsheets/d20/fantasy/text/csheet_PaizoForum.TXT M outputsheets/d20/fantasy/text/csheet_plain.TXT M outputsheets/d20/fantasy_craft/htmlxml/csheet_fantasy_craft_std.htm M outputsheets/d20/fantasy_craft/htmlxml/csheet_fantasycraft_std.htm M outputsheets/d20/modern/htmlxml/csheet_modern_rpgwebprofiler.xml M outputsheets/d20/modern/htmlxml/csheet_modern_statblock1.htm M outputsheets/d20/modern/htmlxml/csheet_modern_std.htm M outputsheets/d20/modern/htmlxml/csheet_spycraft_std.htm M outputsheets/d20/sciencefiction/htmlxml/csheet_dw2_std.htm M outputsheets/d20/western/htmlxml/csheetSidewinder.htm M outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_output_sheet.htm M outputsheets/my_outputsheets/my_fantasy/htmlxml/csheet_my_fantasy_statblock.htm M outputsheets/my_outputsheets/my_fantasy/text/csheet_my_text_sheet.TXT M preview/d20/fantasy/Fantasy_Character_Sheet.html M preview/d20/fantasy/Standard.htm.ftl M preview/d20/fantasy/compact.htm M preview/d20/fantasy/preview.html M preview/d20/fantasy/statblock4.htm M preview/d20/fantasy/statblock5.htm M preview/d20/fantasy/statblock_SRD.htm M preview/d20/fantasy_craft/Fantasy_Craft.htm M preview/d20/fantasy_craft/troubleshooting.htm M preview/d20/gaslight/gaslight_statblock.htm M preview/d20/gaslight/preview.html M preview/d20/homebrew/Standard_homebrew.htm M preview/d20/modern/spycraft_std.htm M preview/d20/modern/standard.htm M preview/d20/modern/statblock1.htm M preview/d20/modern/troubleshooting.htm M preview/d20/sciencefiction/dw2_standard.htm M preview/d20/sciencefiction/dw2_statblock2.htm M preview/d20/western/Deadlands.htm M preview/d20/western/Sidewinder.htm Log Message: ----------- CODE-2807 - Split CampaignSourceEntry correction and additional cleanup Commit: 77403ddbb033288c361bab80cb2a2ab73cafad9f https://github.com/PCGen/pcgen/commit/77403ddbb033288c361bab80cb2a2ab73cafad9f Author: Tom Parker <th...@ya...> Date: 2015-01-19 (Mon, 19 Jan 2015) Log Message: ----------- Merge branch 'master' of https://github.com/thpr/pcgen Commit: 3efe7cd06850bbf30954700022381b995a917656 https://github.com/PCGen/pcgen/commit/3efe7cd06850bbf30954700022381b995a917656 Author: jdempsey-au <jam...@gm...> Date: 2015-01-20 (Tue, 20 Jan 2015) Changed paths: M code/src/java/pcgen/persistence/lst/CampaignSourceEntry.java A code/src/java/pcgen/persistence/lst/URIEntry.java A code/src/java/pcgen/persistence/lst/URIFactory.java M code/src/java/pcgen/rules/persistence/CDOMKitLoader.java M code/src/java/pcgen/rules/persistence/CDOMLoader.java M code/src/java/plugin/lsttokens/equipment/IconToken.java M code/src/utest/plugin/lsttokens/testsupport/CDOMTokenLoader.java Log Message: ----------- Merge pull request #86 from thpr/master CODE-2807 Split CampaignSourceEntry Compare: https://github.com/PCGen/pcgen/compare/bb929a1a23be...3efe7cd06850 |
