Merge branch 'release/3.14'

CHANGELOG.txt

@@ -1,3 +1,8 @@
+v.3.14
+- Added friends/rivals labels to en.json #164 (justinross)
+- Fixes #165 [Multiple Clocks] (justinross)
+- fix faction sheet vanishing on faction delete #167 (Arnatious)
+
 v.3.13
 - Fix playbook max exp to depend on settings rather be hardcoded
 

lang/en.json

@@ -214,5 +214,16 @@
   "BITD.EffectWarning": "Managing Active Effects within an Owned Item is not currently supported by FoundryVTT and will be added in a subsequent update.",
 
   "BITD.Name": "Name",
-  "BITD.CampaignName": "Campaign Name"
+  "BITD.CampaignName": "Campaign Name",
+
+  "BITD.DangerousFriends": "Dangerous Friends",
+  "BITD.EnemiesRivals": "Enemies and Rivals",
+  "BITD.DeadlyFriends": "Deadly Friends",
+  "BITD.Blank": "",
+  "BITD.CleverFriends": "Clever Friends",
+  "BITD.ShadyFriends": "Shady Friends",
+  "BITD.SlyFriends": "Sly Friends",
+  "BITD.ShrewdFriends": "Shrewd Friends",
+  "BITD.DarkServants": "Dark Servants",
+  "BITD.StrangeFriends": "Strange Friends"
 }

module/blades-faction-sheet.js

@@ -9,7 +9,7 @@ export class BladesFactionSheet extends BladesSheet {
   /** @override */
 	static get defaultOptions() {
 	  return foundry.utils.mergeObject(super.defaultOptions, {
-  	  classes: ["blades-in-the-dark", "sheet", "item", "faction"],
+  	  classes: ["blades-in-the-dark", "sheet", "actor", "faction"],
   	  template: "systems/blades-in-the-dark/templates/faction-sheet.html",
       width: 900,
       height: 'auto',
@@ -53,4 +53,4 @@ export class BladesFactionSheet extends BladesSheet {
     });
 	
 	}
-}
+}

templates/actors/clock-sheet.html

@@ -14,7 +14,7 @@
         {{/if}}
 
         <div class="clocks clocks-{{data.type}}">
-            {{{blades-clock "data.value" data.type data.value item.id}}}
+            {{{blades-clock "data.value" data.type data.value actor._id}}}
         </div>
     </div>
 </form>