Merge branch 'main' into feature/Character-Setup-Rework

lang/en.json

@@ -402,6 +402,7 @@
                 "default": "Default Ownership"
             }
         },
+        
         "CONFIG": {
             "ActionType": {
                 "passive": "Passive",
@@ -690,6 +691,10 @@
                     "name": "Dice Set"
                 }
             },
+            "SelectAction": {
+                "selectType": "Select Action Type",
+                "selectAction": "Select Action"
+            },
             "Traits": {
                 "agility": {
                     "name": "Agility",
@@ -967,6 +972,10 @@
                 "stress": {
                     "name": "Stress"
                 }
+            },
+            "Attachments": {
+                "attachHint": "Drop items here to attach them",
+                "transferHint": "If checked, this effect will be applied to any actor that owns this Effect's parent Item. The effect is always applied if this Item is attached to another one."
             }
         },
         "GENERAL": {
@@ -996,6 +1005,11 @@
                 "minor": "Minor",
                 "none": "None"
             },
+            "DamageResistance": {
+                "none": "None",
+                "resistance": "Resistance",
+                "immunity": "Immunity"
+            },
             "DamageThresholds": {
                 "title": "Damage Thresholds",
                 "minor": "Minor",
@@ -1097,7 +1111,8 @@
                 "optional": "Optional",
                 "recovery": "Recovery",
                 "setup": "Setup",
-                "equipment": "Equipment"
+                "equipment": "Equipment",
+                "attachments": "Attachments"
             },
             "Tiers": {
                 "singular": "Tier",