okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upcoming' of https://github.com/ciderapp/Cider into upcoming

Browse source
This commit is contained in:
vapormusic 2022-01-26 22:38:48 +07:00
commit b93264240d
3 changed files with 280 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/views/components/spatial-properties.ejs
View file

@ -73,7 +73,7 @@
</template>
<template v-if="roomEditType == 'positions'">
<div class="row">
<div class="col"><h3>{{$root.getLz('spatial.roomPositons')}}</h3></div>
<div class="col"><h3>{{$root.getLz('spatial.roomPositions')}}</h3></div>
<div class="col-auto flex-center">
<button class="md-btn" @click="roomEditType = 'dimensions'">{{$root.getLz('spatial.setDimensions')}}</button>
</div>

1
src/renderer/views/pages/settings.ejs
View file

@ -543,6 +543,7 @@
<option value="zh_TW">zh_TW</option>
<option value="zh_HK">zh_HK</option>
<option value="en_HODOR">HODOR?</option>
<option value="en_SGA">Galactic</option>
</select>
</div>
</div>