mirror of
https://github.com/Grasscutters/Cultivation.git
synced 2025-12-13 07:34:36 +01:00
Merge branch 'main' into main
This commit is contained in:
@@ -14,7 +14,6 @@
|
|||||||
z-index: 99;
|
z-index: 99;
|
||||||
|
|
||||||
background-color: rgba(0, 0, 0, 0.25);
|
background-color: rgba(0, 0, 0, 0.25);
|
||||||
z-index: 999;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.RightBarInner > div {
|
.RightBarInner > div {
|
||||||
|
|||||||
@@ -31,8 +31,6 @@ interface IState {
|
|||||||
ipPlaceholder: string
|
ipPlaceholder: string
|
||||||
portPlaceholder: string
|
portPlaceholder: string
|
||||||
|
|
||||||
portHelpText: string
|
|
||||||
|
|
||||||
httpsLabel: string
|
httpsLabel: string
|
||||||
httpsEnabled: boolean
|
httpsEnabled: boolean
|
||||||
|
|
||||||
@@ -55,7 +53,6 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
|
|||||||
port: '',
|
port: '',
|
||||||
ipPlaceholder: '',
|
ipPlaceholder: '',
|
||||||
portPlaceholder: '',
|
portPlaceholder: '',
|
||||||
portHelpText: '',
|
|
||||||
httpsLabel: '',
|
httpsLabel: '',
|
||||||
httpsEnabled: false,
|
httpsEnabled: false,
|
||||||
launchServer: () => {
|
launchServer: () => {
|
||||||
@@ -90,7 +87,6 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
|
|||||||
port: config.last_port || '',
|
port: config.last_port || '',
|
||||||
ipPlaceholder: await translate('main.ip_placeholder'),
|
ipPlaceholder: await translate('main.ip_placeholder'),
|
||||||
portPlaceholder: await translate('help.port_placeholder'),
|
portPlaceholder: await translate('help.port_placeholder'),
|
||||||
portHelpText: await translate('help.port_help_text'),
|
|
||||||
httpsLabel: await translate('main.https_enable'),
|
httpsLabel: await translate('main.https_enable'),
|
||||||
httpsEnabled: config.https_enabled || false,
|
httpsEnabled: config.https_enabled || false,
|
||||||
swag: config.swag_mode || false,
|
swag: config.swag_mode || false,
|
||||||
@@ -294,7 +290,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
|
|||||||
onChange={this.setPort}
|
onChange={this.setPort}
|
||||||
initalValue={this.state.port}
|
initalValue={this.state.port}
|
||||||
/>
|
/>
|
||||||
<HelpButton contents={this.state.portHelpText} />
|
<HelpButton contents={'help.port_help_text'} />
|
||||||
<Checkbox
|
<Checkbox
|
||||||
id="httpsEnable"
|
id="httpsEnable"
|
||||||
label={this.state.httpsLabel}
|
label={this.state.httpsLabel}
|
||||||
|
|||||||
Reference in New Issue
Block a user