Merge remote-tracking branch 'WD-core/master' into upstream-core

2024-12-22 00:04:31 +03:00
parent ae5ed73b0f acde49800b
commit b89aeb3879
25 changed files with 333 additions and 83 deletions
--- a/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/icon.png
+++ b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/icon.png
--- a/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/meta.json
+++ b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "unshaded"
+        }
+    ]
+}
--- a/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/unshaded.png
+++ b/Resources/Textures/White/Structures/Decoration/christmas_lights.rsi/unshaded.png