Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ars-magica
- Loading branch information
Showing
1,324 changed files
with
459,284 additions
and
111,929 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| ## Changes / Comments | ||
|
|
||
| *Provide a few comments about what you have changed.* | ||
|
|
||
|
|
||
|
|
||
|
|
||
| ## Roll20 Requests | ||
|
|
||
| *Include the name of the sheet you made changes to in the title.* | ||
|
|
||
| - If changes fix a bug or resolves a feature request, be sure to link to that issue. | ||
| - For pull request that change multiple sheets please confirm these changes are intentional for all sheets. This will help us catch unintended submissions. | ||
| - When updating existing sheets if you are changing attribute names please note what steps you have taken, if any, to assist players in keeping their data. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,140 +1,140 @@ | ||
| { | ||
| "Conflicted": "Conflicted", | ||
| "Negative": "Negative", | ||
| "Positive": "Positive", | ||
| "ac-u": "AC", | ||
| "action": "Action", | ||
| "assassin": "Assassin", | ||
| "Conflicted": "En conflicto", | ||
| "Negative": "Negativo", | ||
| "Positive": "Positivo", | ||
| "ac-u": "CA", | ||
| "action": "Acción", | ||
| "assassin": "Asesino", | ||
| "at-will": "At-Will", | ||
| "attack": "Attack", | ||
| "backgrounds": "Backgrounds", | ||
| "base-ac-from-class": "Base AC from class", | ||
| "base-hp-from-class": "Base HP from class", | ||
| "base-md-from-class": "Base MD from class", | ||
| "base-pd-from-class": "Base PD from class", | ||
| "battle-cry": "Battle Cry", | ||
| "attack": "Ataque", | ||
| "backgrounds": "Trasfondos", | ||
| "base-ac-from-class": "CA base de Clase", | ||
| "base-hp-from-class": "HP base de Clase", | ||
| "base-md-from-class": "DM base de Clase", | ||
| "base-pd-from-class": "DF base de Clase", | ||
| "battle-cry": "Grito de Batalla", | ||
| "bck-u": "BCK", | ||
| "cha-u": "CHA", | ||
| "charisma": "Charisma", | ||
| "charisma-based": "Charisma based", | ||
| "class": "Class", | ||
| "cha-u": "CAR", | ||
| "charisma": "Carisma", | ||
| "charisma-based": "Basado en Carisma", | ||
| "class": "Clase", | ||
| "con-u": "CON", | ||
| "constitution": "Constitution", | ||
| "constitution-based": "Constitution based", | ||
| "constitution": "Constitución", | ||
| "constitution-based": "Basada en Constitución", | ||
| "copyright": "2015 Pelgrane Press Ltd. Published by Pelgrane Press Ltd. under license from Fire Opal Media. The 13th Age is a trademarks of Fire Opal Media, Inc.", | ||
| "critical-success-u": "CRITICAL SUCCESS", | ||
| "current-hp": "Current HP", | ||
| "critical-success-u": "ÉXITO CRÍTICO", | ||
| "current-hp": "PV Actuales", | ||
| "custom": "Custom", | ||
| "custom-1": "Custom 1", | ||
| "custom-2": "Custom 2", | ||
| "custom-3": "Custom 3", | ||
| "daily": "Daily", | ||
| "damage-on-melee-miss": "Damage on Melee Miss", | ||
| "damage-on-ranged-miss": "Damage on Ranged Miss", | ||
| "daily": "Diario", | ||
| "damage-on-melee-miss": "Daño en fallo CaC", | ||
| "damage-on-ranged-miss": "Daño en fallo a distancia", | ||
| "death-save": "Death Save", | ||
| "death-save-u": "DEATH SAVE", | ||
| "details": "Details", | ||
| "dex-u": "DEX", | ||
| "dexterity": "Dexterity", | ||
| "dice-u": "DICE", | ||
| "domain": "Domain", | ||
| "easy-6": "Easy (6+)", | ||
| "effect": "Effect", | ||
| "encounter": "Encounter", | ||
| "details": "Detalles", | ||
| "dex-u": "DES", | ||
| "dexterity": "Destreza", | ||
| "dice-u": "DADO", | ||
| "domain": "Dominio", | ||
| "easy-6": "Fácil (6+)", | ||
| "effect": "Efecto", | ||
| "encounter": "Encuentro", | ||
| "engaged": "Engaged", | ||
| "equipment": "Equipment", | ||
| "escalation-die": "Escalation Die", | ||
| "failure-u": "FAILURE", | ||
| "far-away": "Far Away", | ||
| "feature": "Feature", | ||
| "equipment": "Equipo", | ||
| "escalation-die": "Dado de Incremento", | ||
| "failure-u": "FALLO", | ||
| "far-away": "Muy lejos", | ||
| "feature": "Proezas", | ||
| "final-verse": "Final-Verse", | ||
| "flat-hp-mod-from-magic-items": "Flat HP Mod from Magic Items", | ||
| "flat-initiative-mod": "Flat Initiative Mod", | ||
| "flat-recovery-mod": "Flat Recovery Mod", | ||
| "flexible-action": "Flexible Action", | ||
| "free-action": "Free Action", | ||
| "hard-16": "Hard (16+)", | ||
| "flat-hp-mod-from-magic-items": "Mod PG de objetos mágicos", | ||
| "flat-initiative-mod": "Mod Iniciativa", | ||
| "flat-recovery-mod": "Mod Recuperación", | ||
| "flexible-action": "Acción flexible", | ||
| "free-action": "Acción libre", | ||
| "hard-16": "Difícil (16+)", | ||
| "help-options": "These are base numbers necessary for the automatic calculations below to work. After you've input these numbers you're encouraged to click on the gear icon in the upper right hand corner to hide this section.", | ||
| "hit": "Hit", | ||
| "icon-relationships": "Icon Relationships", | ||
| "improved": "Improved", | ||
| "initiative": "Initiative", | ||
| "initiative-u": "INITIATIVE", | ||
| "hit": "Golpe", | ||
| "icon-relationships": "Relación con Icono", | ||
| "improved": "Mejorada", | ||
| "initiative": "Iniciativa", | ||
| "initiative-u": "INICIATIVA", | ||
| "int-u": "INT", | ||
| "intelligence": "Intelligence", | ||
| "intelligence-based": "Intelligence based", | ||
| "intercepting": "Intercepting", | ||
| "level": "Level", | ||
| "line-of-sight": "Line of Sight", | ||
| "intelligence": "Inteligencia", | ||
| "intelligence-based": "Basado en Inteligencia", | ||
| "intercepting": "Interceptar", | ||
| "level": "Nivel", | ||
| "line-of-sight": "Línea de Visión", | ||
| "lvl-u": "LVL", | ||
| "magic-item": "Magic Item", | ||
| "magic-item": "Objeto mágico", | ||
| "max": "Max", | ||
| "max-hp": "Max HP", | ||
| "max-hp": "PV máx", | ||
| "md-u": "MD", | ||
| "melee-basic-attack": "Melee Basic Attack", | ||
| "melee-basic-attack-based-on": "Melee Basic Attack Based On", | ||
| "melee-str": "Melee(STR)", | ||
| "melee-weapon-1": "Melee Weapon 1", | ||
| "melee-weapon-2": "Melee Weapon 2", | ||
| "melee-weapon-3": "Melee Weapon 3", | ||
| "melee-weapons": "Melee Weapons", | ||
| "miss": "Miss", | ||
| "melee-basic-attack": "Ataque básico CaC", | ||
| "melee-basic-attack-based-on": "Ataque básico CaC basado en", | ||
| "melee-str": "CaC (FUE)", | ||
| "melee-weapon-1": "Arma CaC 1", | ||
| "melee-weapon-2": "Arma CaC 2", | ||
| "melee-weapon-3": "Arma CaC 3", | ||
| "melee-weapons": "Armas CaC", | ||
| "miss": "Fallo", | ||
| "mod-u": "MOD", | ||
| "modifiers": "Modifiers", | ||
| "move-action": "Move Action", | ||
| "name": "Name", | ||
| "nearby": "Nearby", | ||
| "modifiers": "Modificadores", | ||
| "move-action": "Acción de movimiento", | ||
| "name": "Nombre", | ||
| "nearby": "Cercano", | ||
| "normal-11": "Normal (11+)", | ||
| "one-creature": "One Creature", | ||
| "one-enemy": "One enemy", | ||
| "one-unique-thing": "One Unique Thing", | ||
| "one-creature": "Una criatura", | ||
| "one-enemy": "Un enemigo", | ||
| "one-unique-thing": "Peculiaridad única", | ||
| "opening-sustaining-effect": "Opening-Sustaining-Effect", | ||
| "options": "Options", | ||
| "orc-lord": "Orc Lord", | ||
| "options": "Opciones", | ||
| "orc-lord": "Señor Orco", | ||
| "pd-u": "PD", | ||
| "power": "Power", | ||
| "quick-action": "Quick Action", | ||
| "race": "Race", | ||
| "power": "Poder", | ||
| "quick-action": "Acción rápida", | ||
| "race": "Carrera", | ||
| "racial": "Racial", | ||
| "range": "Range", | ||
| "ranged-basic-attack": "Ranged Basic Attack", | ||
| "ranged-basic-attack-based-on": "Ranged Basic Attack Based On", | ||
| "ranged-dex": "Ranged(DEX)", | ||
| "ranged-weapon-1": "Ranged Weapon 1", | ||
| "ranged-weapon-2": "Ranged Weapon 2", | ||
| "ranged-weapon-3": "Ranged Weapon 3", | ||
| "ranged-weapons": "Ranged Weapons", | ||
| "rapier": "Rapier", | ||
| "range": "Rango", | ||
| "ranged-basic-attack": "Ataque básico a distancia", | ||
| "ranged-basic-attack-based-on": "Ataque básico a distancia basado en", | ||
| "ranged-dex": "A distancia (DES)", | ||
| "ranged-weapon-1": "Arma a distancia 1", | ||
| "ranged-weapon-2": "Arma a distancia 2", | ||
| "ranged-weapon-3": "Arma a distancia 3", | ||
| "ranged-weapons": "Armas a distancia", | ||
| "rapier": "Estoque", | ||
| "rec-u": "REC", | ||
| "recharge": "Recharge", | ||
| "recharge-rate": "Recharge Rate", | ||
| "recovery": "Recovery", | ||
| "save": "Save", | ||
| "save-u": "SAVE", | ||
| "show-hide-options": "Show/hide options", | ||
| "special": "Special", | ||
| "spell": "Spell", | ||
| "recharge": "Recargar", | ||
| "recharge-rate": "Velocidad de recarga", | ||
| "recovery": "Recuperación", | ||
| "save": "Guardar", | ||
| "save-u": "GUARDAR", | ||
| "show-hide-options": "Mostrar/ocultar opciones", | ||
| "special": "Especial", | ||
| "spell": "Hechizo", | ||
| "staggered": "Staggered", | ||
| "standard-action": "Standard Action", | ||
| "step-toward-death": "Mark a step toward death!", | ||
| "str-u": "STR", | ||
| "strength": "Strength", | ||
| "success-u": "SUCCESS", | ||
| "standard-action": "Acción estándar", | ||
| "step-toward-death": "¡Un paso más hacia la muerte!", | ||
| "str-u": "FUE", | ||
| "strength": "Fuerza", | ||
| "success-u": "ÉXITO", | ||
| "sustain": "Sustain", | ||
| "talent": "Talent", | ||
| "talents-and-features": "Talents & Features", | ||
| "target": "Target", | ||
| "temp-hp": "Temp HP", | ||
| "talent": "Talento", | ||
| "talents-and-features": "Talentos y Proezas", | ||
| "target": "Objetivo", | ||
| "temp-hp": "Temp PV", | ||
| "trigger": "Trigger", | ||
| "type": "Type", | ||
| "unknown-u": "UNKNOWN", | ||
| "use-recovery": "Use a recovery!", | ||
| "use-recovery-action": "Use a recovery and take an action!", | ||
| "uses": "Uses", | ||
| "type": "Tipo", | ||
| "unknown-u": "DESCONOCIDO", | ||
| "use-recovery": "¡Usa una recuperación!", | ||
| "use-recovery-action": "¡Usa una recuperación y realiza una acción!", | ||
| "uses": "Usa", | ||
| "vs": "vs", | ||
| "vs-u": "VS", | ||
| "weap-u": "WEAP", | ||
| "wis-u": "WIS", | ||
| "wisdom": "Wisdom", | ||
| "wisdom-based": "Wisdom based" | ||
| "weap-u": "ARMA", | ||
| "wis-u": "SAB", | ||
| "wisdom": "Sabiduría", | ||
| "wisdom-based": "Basado en Sabiduría" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.