Merge remote-tracking branch 'upstream/main'

Browse Source

# Conflicts:
#	public/UITexts.example
#	src/api/wired/WiredActionLayoutCode.ts
#	src/api/wired/WiredConditionLayoutCode.ts
#	src/api/wired/WiredTriggerLayoutCode.ts
#	src/components/wired/views/WiredBaseView.tsx
#	src/components/wired/views/WiredSourcesSelector.tsx
#	src/components/wired/views/actions/WiredActionLayoutView.tsx
#	src/components/wired/views/conditions/WiredConditionLayoutView.tsx
#	src/components/wired/views/conditions/WiredConditionTriggererMatchView.tsx
#	src/components/wired/views/triggers/WiredTriggerClickFurniView.tsx
#	src/components/wired/views/triggers/WiredTriggerClickTileView.tsx
#	src/components/wired/views/triggers/WiredTriggerClickUserView.tsx
#	src/components/wired/views/triggers/WiredTriggerLayoutView.tsx
#	src/components/wired/views/triggers/WiredTriggerToggleFurniView.tsx

...

This commit is contained in:

Lorenzune

2026-03-21 14:47:52 +01:00

parent 27cb71f0cc 581f7957e8

commit 6e76c617c1

60 changed files with 9794 additions and 354 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/assets/images/notifications/coolui.png

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 18 KiB

src/assets/images/notifications/nitro_v3.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 24 KiB