Merge pull request #355 from mrkwnzl/develop

Develop

CHANGELOG.md

@@ -4,16 +4,20 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.13.1] - 2024-01-12
+### Fixed
+- The Recovery Roll button is now included in the option to show the roll buttons only for stats.
+
 ## [2.13.0] - 2024-01-12
 ### Added
 - A new setting to show the roll buttons only on stats (Might, Speed, Intellect), but nowhere else on the sheet. This can be used when you don’t want to use the All-in-One roll dialog to adjust the difficulty by hand (but in your head instead). GMs can still set a difficulty beforehand (and the AiO roll dialog can still be used), but this discourages the use of roll automations. As such, this setting works best with the Use All-in-One Dialog as Default setting disabled.
-- There’s now a compatibilty warning when the Cypher System Custom Sheets module is enabled.
+- There’s now a compatibility warning when the Cypher System Custom Sheets module is enabled.
 
 ### Changed
 - Updated translations.
 
 ### Fixed
-- Abilties can be copied as armor again.
+- Abilities can be copied as armor again.
 - Fixed word break in tables in journals and descriptions.
 
 ## [2.12.0] - 2023-12-06

lang/de.json

@@ -651,5 +651,13 @@
   "CYPHERSYSTEM.TagCategoryTwo": "Tags 2",
   "CYPHERSYSTEM.TagCategoryThree": "Tags 3",
   "CYPHERSYSTEM.TagCategoryFour": "Tags 4",
-  "CYPHERSYSTEM.TagCategories": "Tag-Kategorien"
+  "CYPHERSYSTEM.TagCategories": "Tag-Kategorien",
+  "CYPHERSYSTEM.SettingRollButtonsDisabled": "Deaktiviert",
+  "CYPHERSYSTEM.SettingRollButtonsEnabled": "Aktiviert",
+  "CYPHERSYSTEM.SettingRollButtonsOnlyStats": "Für Attribute und Erholungswürfe aktiviert",
+  "CYPHERSYSTEM.AddTagToItem": "Tag zu Item hinzufügen",
+  "CYPHERSYSTEM.RemoveTagFromItem": "Tag von Item entfernen",
+  "CYPHERSYSTEM.AddRecursionToItem": "Rekursion zu Item hinzufügen",
+  "CYPHERSYSTEM.RemoveRecursionFromItem": "Rekursion von Item entfernen",
+  "CYPHERSYSTEM.ThisMacroHasBeenDeprecated": "Dieses Makro ist veraltet."
 }

lang/en.json

@@ -66,7 +66,7 @@
   "CYPHERSYSTEM.SettingRollButtonsHint": "This enables roll buttons on all character sheets.",
   "CYPHERSYSTEM.SettingRollButtonsDisabled": "Disabled",
   "CYPHERSYSTEM.SettingRollButtonsEnabled": "Enabled",
-  "CYPHERSYSTEM.SettingRollButtonsOnlyStats": "Enabled on Stats",
+  "CYPHERSYSTEM.SettingRollButtonsOnlyStats": "Enabled on Stats and Recovery Rolls",
   "CYPHERSYSTEM.SettingDiceTray": "Dice Tray",
   "CYPHERSYSTEM.SettingDiceTrayHint": "Show dice tray for simple d6, d10, d20, and d100 rolls on PC sheets",
   "CYPHERSYSTEM.SettingDiceTrayDisabled": "Disabled",

packs/markers/CURRENT

@@ -1 +1 @@
-MANIFEST-000952
+MANIFEST-000956

packs/markers/LOG

@@ -1,3 +1,3 @@
-2024/01/12-09:48:13.313069 30b370000 Recovering log #951
-2024/01/12-09:48:13.313411 30b370000 Delete type=0 #951
-2024/01/12-09:48:13.313435 30b370000 Delete type=3 #950
+2024/01/12-13:16:10.830476 310406000 Recovering log #955
+2024/01/12-13:16:10.830784 310406000 Delete type=3 #954
+2024/01/12-13:16:10.830818 310406000 Delete type=0 #955

packs/markers/LOG.old

@@ -1,3 +1,3 @@
-2024/01/10-12:07:06.435305 30f8e6000 Recovering log #949
-2024/01/10-12:07:06.435675 30f8e6000 Delete type=3 #948
-2024/01/10-12:07:06.435723 30f8e6000 Delete type=0 #949
+2024/01/12-13:03:16.831443 313ce3000 Recovering log #953
+2024/01/12-13:03:16.831739 313ce3000 Delete type=0 #953
+2024/01/12-13:03:16.831761 313ce3000 Delete type=3 #952

packs/roll-macros/CURRENT

@@ -1 +1 @@
-MANIFEST-000952
+MANIFEST-000956

packs/roll-macros/LOG

@@ -1,3 +1,3 @@
-2024/01/12-09:48:13.310985 30c36e000 Recovering log #951
-2024/01/12-09:48:13.311390 30c36e000 Delete type=0 #951
-2024/01/12-09:48:13.311429 30c36e000 Delete type=3 #950
+2024/01/12-13:16:10.828469 310c05000 Recovering log #955
+2024/01/12-13:16:10.829073 310c05000 Delete type=3 #954
+2024/01/12-13:16:10.829114 310c05000 Delete type=0 #955

packs/roll-macros/LOG.old

@@ -1,3 +1,3 @@
-2024/01/10-12:07:06.433254 30f0e7000 Recovering log #949
-2024/01/10-12:07:06.433714 30f0e7000 Delete type=3 #948
-2024/01/10-12:07:06.433761 30f0e7000 Delete type=0 #949
+2024/01/12-13:03:16.829575 314ce1000 Recovering log #953
+2024/01/12-13:03:16.829894 314ce1000 Delete type=0 #953
+2024/01/12-13:03:16.829919 314ce1000 Delete type=3 #952

packs/scenes/CURRENT

@@ -1 +1 @@
-MANIFEST-000955
+MANIFEST-000959

packs/scenes/LOG

@@ -1,3 +1,3 @@
-2024/01/12-09:48:13.315730 30c36e000 Recovering log #954
-2024/01/12-09:48:13.316149 30c36e000 Delete type=3 #953
-2024/01/12-09:48:13.316181 30c36e000 Delete type=0 #954
+2024/01/12-13:16:10.832504 310c05000 Recovering log #958
+2024/01/12-13:16:10.832797 310c05000 Delete type=3 #957
+2024/01/12-13:16:10.832829 310c05000 Delete type=0 #958

packs/scenes/LOG.old

@@ -1,3 +1,3 @@
-2024/01/10-12:07:06.437691 30f0e7000 Recovering log #952
-2024/01/10-12:07:06.438064 30f0e7000 Delete type=0 #952
-2024/01/10-12:07:06.438088 30f0e7000 Delete type=3 #951
+2024/01/12-13:03:16.833623 314ce1000 Recovering log #956
+2024/01/12-13:03:16.833919 314ce1000 Delete type=3 #955
+2024/01/12-13:03:16.833951 314ce1000 Delete type=0 #956

packs/secret-settings/CURRENT

@@ -1 +1 @@
-MANIFEST-000955
+MANIFEST-000959

packs/secret-settings/LOG

@@ -1,3 +1,3 @@
-2024/01/12-09:48:13.321175 30b370000 Recovering log #954
-2024/01/12-09:48:13.321647 30b370000 Delete type=3 #953
-2024/01/12-09:48:13.321705 30b370000 Delete type=0 #954
+2024/01/12-13:16:10.836199 310406000 Recovering log #958
+2024/01/12-13:16:10.836604 310406000 Delete type=3 #957
+2024/01/12-13:16:10.836659 310406000 Delete type=0 #958

packs/secret-settings/LOG.old

@@ -1,3 +1,3 @@
-2024/01/10-12:07:06.442075 30f8e6000 Recovering log #952
-2024/01/10-12:07:06.442406 30f8e6000 Delete type=0 #952
-2024/01/10-12:07:06.442431 30f8e6000 Delete type=3 #951
+2024/01/12-13:03:16.838080 313ce3000 Recovering log #956
+2024/01/12-13:03:16.838386 313ce3000 Delete type=3 #955
+2024/01/12-13:03:16.838420 313ce3000 Delete type=0 #956

packs/utility-macros/CURRENT

@@ -1 +1 @@
-MANIFEST-000958
+MANIFEST-000962

packs/utility-macros/LOG

@@ -1,3 +1,3 @@
-2024/01/12-09:48:13.318994 30c36e000 Recovering log #957
-2024/01/12-09:48:13.319364 30c36e000 Delete type=0 #957
-2024/01/12-09:48:13.319409 30c36e000 Delete type=3 #956
+2024/01/12-13:16:10.834662 310c05000 Recovering log #961
+2024/01/12-13:16:10.835074 310c05000 Delete type=3 #960
+2024/01/12-13:16:10.835114 310c05000 Delete type=0 #961

packs/utility-macros/LOG.old

@@ -1,3 +1,3 @@
-2024/01/10-12:07:06.440490 30f0e7000 Recovering log #955
-2024/01/10-12:07:06.440829 30f0e7000 Delete type=3 #954
-2024/01/10-12:07:06.440872 30f0e7000 Delete type=0 #955
+2024/01/12-13:03:16.835921 314ce1000 Recovering log #959
+2024/01/12-13:03:16.836375 314ce1000 Delete type=3 #958
+2024/01/12-13:03:16.836420 314ce1000 Delete type=0 #959

system.json

@@ -2,14 +2,14 @@
   "id": "cyphersystem",
   "title": "Cypher System",
   "description": "A flexible implementation of the Cypher System for Foundry VTT.",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "compatibility": {
     "minimum": "11",
     "verified": "11.315"
   },
   "url": "https://github.com/mrkwnzl/cyphersystem-foundryvtt",
   "manifest": "https://raw.githubusercontent.com/mrkwnzl/cyphersystem-foundryvtt/main/system.json",
-  "download": "https://github.com/mrkwnzl/cyphersystem-foundryvtt/releases/download/v2.13.0/release.zip",
+  "download": "https://github.com/mrkwnzl/cyphersystem-foundryvtt/releases/download/v2.13.1/release.zip",
   "authors": [
     {
       "name": "Marko Wenzel",

templates/tabs/combat-tab/damage-track.html

@@ -129,7 +129,7 @@
            {{localize 'CYPHERSYSTEM.RecoveryHours'}}
         </div>
         <div class="item-controls">
-          {{#if (eq sheetSettings.rollButtons 1)}}
+          {{#if (gte sheetSettings.rollButtons 1)}}
             <a class="item-control recovery-roll {{#if sheetSettings.isObserver}}disabled{{/if}}" title="{{localize 'CYPHERSYSTEM.RecoveryRoll'}}">
               <i class="fas fa-dice-d20"></i>
             </a>