Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties

This commit is contained in:
Artur
2020-01-16 11:38:09 +02:00
87 changed files with 4858 additions and 4394 deletions

View File

@@ -132,7 +132,7 @@
</ui-notice>
<ui-notice>
<ui-section label='Night Shift Lighting'>
{{#if data.locked && !data.siliconUser}}
{{#if data.locked && !data.siliconUser && data.lock_nightshift}}
<span>{{data.nightshiftLights ? "Enabled" : "Disabled"}}</span>
{{else}}
<ui-button icon='lightbulb-o' action='toggle_nightshift'>{{data.nightshiftLights ? "Enabled" : "Disabled"}}</ui-button>