Merge branch 'master' into Dev-Vlyan

# Conflicts:
#	system/l5r-ui/ui/cursors/normal.webp

system/templates/sheets/actor-sheet.html

@@ -8,6 +8,7 @@
         </div>
         <div class="header-fields">
             {{> 'systems/l5r5e/templates/sheets/actor/social.html' }}
+            <h2>{{ localize 'L5r5e.Attributes.Title' }}</h2>
             {{> 'systems/l5r5e/templates/sheets/actor/rings.html' }}
             {{> 'systems/l5r5e/templates/sheets/actor/attributes.html' }}
         </div>
@@ -33,7 +34,7 @@
         <article class="tab skills" data-group="primary" data-tab="skills">
             <ul class="skills-wrapper">
                 {{#each data.skills as |category id|}}
-                    {{> 'systems/l5r/templates/sheets/actor/category.html' category=category categoryId=id}}
+                    {{> 'systems/l5r5e/templates/sheets/actor/category.html' category=category categoryId=id}}
                 {{/each}}
             </ul>
             {{> 'systems/l5r5e/templates/sheets/actor/feats.html' }}

system/templates/sheets/actor/attributes.html

@@ -1,52 +1,48 @@
 <ul class="attributes-wrapper">
     <li class="endurance-content">
         <label class="attribute-label">
-            {{ localize 'L5r5e.Conflict.Endurance' }}
+            {{ localize 'L5r5e.Attributes.Endurance' }}
             <input class="centered-input" type="text" name="data.endurance" value="{{data.endurance}}" data-dtype="Number" disabled/>
         </label>
         <label class="attribute-label">
-            {{ localize 'L5r5e.Conflict.Fatigue' }}
+            {{ localize 'L5r5e.Attributes.Fatigue' }}
             <input class="centered-input" type="text" name="data.fatigue" value="{{data.fatigue}}" data-dtype="Number"/>
         </label>
-        <p class="quick-rules"> {{ localize 'L5r5e.Conflict.EnduranceTip' }}</p>
+        <p class="quick-rules"> {{ localize 'L5r5e.Attributes.EnduranceTip' }}</p>
     </li>
     <li class="composure-content">
         <label class="attribute-label">
-            {{ localize 'L5r5e.Conflict.Composure' }}
+            {{ localize 'L5r5e.Attributes.Composure' }}
             <input class="centered-input" type="text" name="data.composure" value="{{data.composure}}" data-dtype="Number" disabled/>
         </label>
         <label class="attribute-label">
-            {{ localize 'L5r5e.Conflict.Strife' }}
+            {{ localize 'L5r5e.Attributes.Strife' }}
             <input class="centered-input" type="text" name="data.strife" value="{{data.strife}}" data-dtype="Number"/>
         </label>
-        <p class="quick-rules"> {{ localize 'L5r5e.Conflict.ComposureTip' }}</p>
+        <p class="quick-rules"> {{ localize 'L5r5e.Attributes.ComposureTip' }}</p>
     </li>
     <li class="focus-content">
         <label class="attribute-label">
-            {{ localize 'L5r5e.Conflict.Focus' }}
+            {{ localize 'L5r5e.Attributes.Focus' }}
             <input class="centered-input" type="text" name="data.focus" value="{{data.focus}}" data-dtype="Number" disabled/>
         </label>
-        <p class="quick-rules"> {{ localize 'L5r5e.Conflict.FocusTip' }}</p>
+        <p class="quick-rules"> {{ localize 'L5r5e.Attributes.FocusTip' }}</p>
     </li>
     <li class="vigilante-content">
         <label class="attribute-label">
-            {{ localize 'L5r5e.Conflict.Vigilante' }}
+            {{ localize 'L5r5e.Attributes.Vigilante' }}
             <input class="centered-input" type="text" name="data.vigilante" value="{{data.vigilante}}" data-dtype="Number" disabled/>
         </label>
-        <p class="quick-rules"> {{ localize 'L5r5e.Conflict.VigilanteTip' }}</p>
+        <p class="quick-rules"> {{ localize 'L5r5e.Attributes.VigilanteTip' }}</p>
     </li>
-    <li class="void-points-content">
-        <div>
-            <label class="attribute-label">
-                {{ localize 'L5r5e.Conflict.VoidPoints' }}
-                <input class="centered-input" type="text" name="data.void_points.current" value="{{data.void_points.current}}" data-dtype="Number"/>
-            </label>
-        </div>
-        <div>
-            <label class="attribute-label">
-                {{ localize 'L5r5e.Max' }}
-                <input class="centered-input" type="text" name="data.void_points.max" value="{{data.void_points.max}}" data-dtype="Number" disabled/>
-            </label>
-        </div>
+    <li class="void-content">
+        <label class="attribute-label">
+            {{ localize 'L5r5e.Attributes.VoidPoints' }}
+            <input class="centered-input" type="text" name="data.void_points.current" value="{{data.void_points.current}}" data-dtype="Number"/>
+        </label>
+        <label class="attribute-label">
+            {{ localize 'L5r5e.Max' }}
+            <input class="centered-input" type="text" name="data.void_points.max" value="{{data.void_points.max}}" data-dtype="Number" disabled/>
+        </label>
     </li>
 </ul>

system/templates/sheets/actor/category.html

@@ -2,7 +2,7 @@
     <h4 class="section-header">{{ localizeSkillCategory categoryId }}</h4>
     <ul class="skill-category-skills-list">
         {{#each category as |skill id| }}
-            {{> 'systems/l5r/templates/sheets/actor/skill.html' categoryId=../categoryId skill=skill skillId=id }}
+            {{> 'systems/l5r5e/templates/sheets/actor/skill.html' categoryId=../categoryId skill=skill skillId=id }}
         {{/each}}
     </ul>
     <ul class="skill-category-ring-actions">

system/templates/sheets/actor/identity.html

@@ -1,22 +1,32 @@
 <ul class="identity-content">
     <li>
-        <label class="attribute-label">{{ localize 'L5r5e.Clan' }}</label>
-        <input type="text" name="data.identity.clan" value="{{data.identity.clan}}"/>
+        <label class="attribute-label">
+            {{ localize 'L5r5e.Clan' }}
+            <input type="text" name="data.identity.clan" value="{{data.identity.clan}}"/>
+        </label>
     </li>
     <li>
-        <label class="attribute-label">{{ localize 'L5r5e.Family' }}</label>
-        <input type="text" name="data.identity.family" value="{{data.identity.family}}"/>
+        <label class="attribute-label">
+            {{ localize 'L5r5e.Family' }}
+            <input type="text" name="data.identity.family" value="{{data.identity.family}}"/>
+        </label>
     </li>
     <li>
-        <label class="attribute-label">{{ localize 'L5r5e.School' }}</label>
-        <input type="text" name="data.identity.school" value="{{data.identity.school}}"/>
+        <label class="attribute-label">
+            {{ localize 'L5r5e.School' }}
+            <input type="text" name="data.identity.school" value="{{data.identity.school}}"/>
+        </label>
     </li>
     <li>
-        <label class="attribute-label">{{ localize 'L5r5e.SchoolRank' }}</label>
-        <input type="text" name="data.identity.school_rank" value="{{data.identity.school_rank}}" data-dtype="Number" placeholder="0"/>
+        <label class="attribute-label">
+            {{ localize 'L5r5e.SchoolRank' }}
+            <input type="text" name="data.identity.school_rank" value="{{data.identity.school_rank}}" data-dtype="Number" placeholder="0"/>
+        </label>
     </li>
     <li>
-        <label class="attribute-label">{{ localize 'L5r5e.Roles' }}</label>
-        <input type="text" name="data.identity.roles" value="{{data.identity.roles}}"/>
+        <label class="attribute-label">
+            {{ localize 'L5r5e.Roles' }}
+            <input type="text" name="data.identity.roles" value="{{data.identity.roles}}"/>
+        </label>
     </li>
 </ul>

system/templates/sheets/actor/social.html

@@ -1,14 +1,20 @@
 <ul class="social-content">
     <li>
-        <label class="attribute-label centered-input">{{ localize 'L5r5e.SocialStanding.Honor' }}</label>
-        <input class="centered-input" type="text" name="data.social_standing.honor" value="{{data.social_standing.honor}}" placeholder="0"/>
+        <label class="attribute-label centered-input">
+            {{ localize 'L5r5e.SocialStanding.Honor' }}
+            <input class="centered-input" type="text" name="data.social.honor" value="{{data.social.honor}}" placeholder="0"/>
+        </label>
     </li>
     <li>
-        <label class="attribute-label centered-input">{{ localize 'L5r5e.SocialStanding.Glory' }}</label>
-        <input class="centered-input" type="text" name="data.social_standing.glory" value="{{data.social_standing.glory}}" placeholder="0"/>
+        <label class="attribute-label centered-input">
+            {{ localize 'L5r5e.SocialStanding.Glory' }}
+            <input class="centered-input" type="text" name="data.social.glory" value="{{data.social.glory}}" placeholder="0"/>
+        </label>
     </li>
     <li>
-        <label class="attribute-label centered-input">{{ localize 'L5r5e.SocialStanding.Status' }}</label>
-        <input class="centered-input" type="text" name="data.social_standing.status" value="{{data.social_standing.status}}" placeholder="0"/>
+        <label class="attribute-label centered-input">
+            {{ localize 'L5r5e.SocialStanding.Status' }}
+            <input class="centered-input" type="text" name="data.social.status" value="{{data.social.status}}" placeholder="0"/>
+        </label>
     </li>
 </ul>