Merge pull request #347 from mrkwnzl/develop

Update 2.11.1
mrkwnzl · Nov 2, 2023 · d60e238 · d60e238
2 parents a2d909d + ce855f6
commit d60e238
Show file tree

Hide file tree

Showing 28 changed files with 49 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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.11.1] - 2023-11-02
+### Fixed
+- The dropdown to sort tags via the settings tab is now populated correctly.
+
 ## [2.11.0] - 2023-11-02
 ### Added
 - It’s now possible to change stats with normal tags.

diff --git a/packs/utility-macros/000717.log → packs/markers/000717.log b/packs/utility-macros/000717.log → packs/markers/000717.log
diff --git a/packs/markers/CURRENT b/packs/markers/CURRENT
@@ -1 +1 @@
-MANIFEST-000710
+MANIFEST-000716
diff --git a/packs/markers/LOG b/packs/markers/LOG
@@ -1,3 +1,3 @@
-2023/11/02-16:11:50.094564 30f31e000 Recovering log #709
-2023/11/02-16:11:50.094957 30f31e000 Delete type=3 #708
-2023/11/02-16:11:50.094995 30f31e000 Delete type=0 #709
+2023/11/02-17:40:12.393865 30f43a000 Recovering log #715
+2023/11/02-17:40:12.394247 30f43a000 Delete type=0 #715
+2023/11/02-17:40:12.394280 30f43a000 Delete type=3 #714
diff --git a/packs/markers/LOG.old b/packs/markers/LOG.old
@@ -1,3 +1,3 @@
-2023/11/02-15:26:51.267305 312950000 Recovering log #706
-2023/11/02-15:26:51.267621 312950000 Delete type=0 #706
-2023/11/02-15:26:51.267650 312950000 Delete type=3 #704
+2023/11/02-16:58:37.931099 312a2c000 Recovering log #713
+2023/11/02-16:58:37.931392 312a2c000 Delete type=3 #712
+2023/11/02-16:58:37.931429 312a2c000 Delete type=0 #713
diff --git a/packs/markers/MANIFEST-000710 → packs/markers/MANIFEST-000716 b/packs/markers/MANIFEST-000710 → packs/markers/MANIFEST-000716
diff --git a/packs/markers/000711.log → packs/roll-macros/000717.log b/packs/markers/000711.log → packs/roll-macros/000717.log
diff --git a/packs/roll-macros/CURRENT b/packs/roll-macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000710
+MANIFEST-000716
diff --git a/packs/roll-macros/LOG b/packs/roll-macros/LOG
@@ -1,3 +1,3 @@
-2023/11/02-16:11:50.092401 30e320000 Recovering log #709
-2023/11/02-16:11:50.092856 30e320000 Delete type=3 #708
-2023/11/02-16:11:50.092904 30e320000 Delete type=0 #709
+2023/11/02-17:40:12.391118 30ec3b000 Recovering log #715
+2023/11/02-17:40:12.391543 30ec3b000 Delete type=0 #715
+2023/11/02-17:40:12.391575 30ec3b000 Delete type=3 #714
diff --git a/packs/roll-macros/LOG.old b/packs/roll-macros/LOG.old
@@ -1,3 +1,3 @@
-2023/11/02-15:26:51.264723 31414d000 Recovering log #706
-2023/11/02-15:26:51.265153 31414d000 Delete type=0 #706
-2023/11/02-15:26:51.265188 31414d000 Delete type=3 #704
+2023/11/02-16:58:37.928547 31322b000 Recovering log #713
+2023/11/02-16:58:37.929011 31322b000 Delete type=3 #712
+2023/11/02-16:58:37.929059 31322b000 Delete type=0 #713
diff --git a/packs/roll-macros/MANIFEST-000710 → packs/roll-macros/MANIFEST-000716 b/packs/roll-macros/MANIFEST-000710 → packs/roll-macros/MANIFEST-000716
diff --git a/packs/roll-macros/000711.log → packs/scenes/000720.log b/packs/roll-macros/000711.log → packs/scenes/000720.log
diff --git a/packs/scenes/CURRENT b/packs/scenes/CURRENT
@@ -1 +1 @@
-MANIFEST-000713
+MANIFEST-000719
diff --git a/packs/scenes/LOG b/packs/scenes/LOG
@@ -1,3 +1,3 @@
-2023/11/02-16:11:50.097314 30e320000 Recovering log #712
-2023/11/02-16:11:50.097624 30e320000 Delete type=0 #712
-2023/11/02-16:11:50.097649 30e320000 Delete type=3 #711
+2023/11/02-17:40:12.396701 30ec3b000 Recovering log #718
+2023/11/02-17:40:12.397177 30ec3b000 Delete type=0 #718
+2023/11/02-17:40:12.397222 30ec3b000 Delete type=3 #717
diff --git a/packs/scenes/LOG.old b/packs/scenes/LOG.old
@@ -1,3 +1,3 @@
-2023/11/02-15:26:51.269172 31414d000 Recovering log #709
-2023/11/02-15:26:51.269483 31414d000 Delete type=3 #707
-2023/11/02-15:26:51.269521 31414d000 Delete type=0 #709
+2023/11/02-16:58:37.934040 31322b000 Recovering log #716
+2023/11/02-16:58:37.934399 31322b000 Delete type=0 #716
+2023/11/02-16:58:37.934435 31322b000 Delete type=3 #715
diff --git a/packs/scenes/MANIFEST-000713 → packs/scenes/MANIFEST-000719 b/packs/scenes/MANIFEST-000713 → packs/scenes/MANIFEST-000719
diff --git a/packs/scenes/000714.log → packs/secret-settings/000720.log b/packs/scenes/000714.log → packs/secret-settings/000720.log
diff --git a/packs/secret-settings/CURRENT b/packs/secret-settings/CURRENT
@@ -1 +1 @@
-MANIFEST-000713
+MANIFEST-000719
diff --git a/packs/secret-settings/LOG b/packs/secret-settings/LOG
@@ -1,3 +1,3 @@
-2023/11/02-16:11:50.102135 30f31e000 Recovering log #712
-2023/11/02-16:11:50.102451 30f31e000 Delete type=0 #712
-2023/11/02-16:11:50.102472 30f31e000 Delete type=3 #711
+2023/11/02-17:40:12.402343 30f43a000 Recovering log #718
+2023/11/02-17:40:12.402763 30f43a000 Delete type=0 #718
+2023/11/02-17:40:12.402820 30f43a000 Delete type=3 #717
diff --git a/packs/secret-settings/LOG.old b/packs/secret-settings/LOG.old
@@ -1,3 +1,3 @@
-2023/11/02-15:26:51.272398 312950000 Recovering log #709
-2023/11/02-15:26:51.272696 312950000 Delete type=3 #707
-2023/11/02-15:26:51.272729 312950000 Delete type=0 #709
+2023/11/02-16:58:37.939306 312a2c000 Recovering log #716
+2023/11/02-16:58:37.939644 312a2c000 Delete type=0 #716
+2023/11/02-16:58:37.939667 312a2c000 Delete type=3 #715
diff --git a/packs/secret-settings/MANIFEST-000713 → packs/secret-settings/MANIFEST-000719 b/packs/secret-settings/MANIFEST-000713 → packs/secret-settings/MANIFEST-000719
diff --git a/packs/secret-settings/000714.log → packs/utility-macros/000723.log b/packs/secret-settings/000714.log → packs/utility-macros/000723.log
diff --git a/packs/utility-macros/CURRENT b/packs/utility-macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000716
+MANIFEST-000722
diff --git a/packs/utility-macros/LOG b/packs/utility-macros/LOG
@@ -1,3 +1,3 @@
-2023/11/02-16:11:50.100966 30e320000 Recovering log #715
-2023/11/02-16:11:50.101287 30e320000 Delete type=0 #715
-2023/11/02-16:11:50.101311 30e320000 Delete type=3 #714
+2023/11/02-17:40:12.400252 30ec3b000 Recovering log #721
+2023/11/02-17:40:12.400638 30ec3b000 Delete type=0 #721
+2023/11/02-17:40:12.400672 30ec3b000 Delete type=3 #720
diff --git a/packs/utility-macros/LOG.old b/packs/utility-macros/LOG.old
@@ -1,3 +1,3 @@
-2023/11/02-15:26:51.271188 31414d000 Recovering log #712
-2023/11/02-15:26:51.271483 31414d000 Delete type=0 #712
-2023/11/02-15:26:51.271523 31414d000 Delete type=3 #710
+2023/11/02-16:58:37.937322 31322b000 Recovering log #719
+2023/11/02-16:58:37.937623 31322b000 Delete type=0 #719
+2023/11/02-16:58:37.937647 31322b000 Delete type=3 #718
diff --git a/packs/utility-macros/MANIFEST-000716 → packs/utility-macros/MANIFEST-000722 b/packs/utility-macros/MANIFEST-000716 → packs/utility-macros/MANIFEST-000722
diff --git a/system.json b/system.json
@@ -2,14 +2,14 @@
   "id": "cyphersystem",
   "title": "Cypher System",
   "description": "A flexible implementation of the Cypher System for Foundry VTT.",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "compatibility": {
     "minimum": "11",
     "verified": "11.313"
   },
   "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.11.0/release.zip",
+  "download": "https://github.com/mrkwnzl/cyphersystem-foundryvtt/releases/download/v2.11.1/release.zip",
   "authors": [
     {
       "name": "Marko Wenzel",

diff --git a/templates/tabs/settings-tab/settings-tag.html b/templates/tabs/settings-tab/settings-tag.html
@@ -14,25 +14,25 @@
               <select class="auto-margin setting-input" name="system.settings.general.sorting" style="width: 135px">
                 {{#select item.system.settings.general.sorting}}
                   <option value="Tag">
-                    {{#if actor.system.settings.tags.labelCategory1}}
-                      {{actor.system.settings.tags.labelCategory1}}
+                    {{#if actor.system.settings.general.tags.labelCategory1}}
+                      {{actor.system.settings.general.tags.labelCategory1}}
                     {{else}}
                       {{localize 'CYPHERSYSTEM.Tags'}}
                     {{/if}}
                   </option>
-                  {{#if actor.system.settings.tags.labelCategory2}}
+                  {{#if actor.system.settings.general.tags.labelCategory2}}
                     <option value="TagTwo">
-                      {{actor.system.settings.tags.labelCategory2}}
+                      {{actor.system.settings.general.tags.labelCategory2}}
                     </option>
                   {{/if}}
-                  {{#if actor.system.settings.tags.labelCategory3}}
+                  {{#if actor.system.settings.general.tags.labelCategory3}}
                     <option value="TagThree">
-                      {{actor.system.settings.tags.labelCategory3}}
+                      {{actor.system.settings.general.tags.labelCategory3}}
                     </option>
                   {{/if}}
-                  {{#if actor.system.settings.tags.labelCategory4}}
+                  {{#if actor.system.settings.general.tags.labelCategory4}}
                     <option value="TagFour">
-                      {{actor.system.settings.tags.labelCategory4}}
+                      {{actor.system.settings.general.tags.labelCategory4}}
                     </option>
                   {{/if}}
                 {{/select}}