Small fixes

This commit is contained in:
Thoronium
2023-02-25 19:21:40 -07:00
committed by GitHub
parent 3848c39743
commit 9b1d3594ed
5 changed files with 11 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "cultivation", "name": "cultivation",
"version": "1.1.11-Thorny", "version": "1.0.20",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@tauri-apps/api": "^1.0.0-rc.5", "@tauri-apps/api": "^1.0.0-rc.5",

View File

@@ -1,7 +1,7 @@
{ {
"lang_name": "English", "lang_name": "English",
"main": { "main": {
"title": "Cultivation", "title": "Cultivation: Thorny Edition",
"launch_button": "Launch", "launch_button": "Launch",
"gc_enable": "Connect via Grasscutter", "gc_enable": "Connect via Grasscutter",
"https_enable": "Use HTTPS", "https_enable": "Use HTTPS",
@@ -31,6 +31,7 @@
"horny_mode": "Horny Mode" "horny_mode": "Horny Mode"
}, },
"downloads": { "downloads": {
"grasscutter_fullbuild": "Download Grasscutter Full Build",
"grasscutter_stable_data": "Download Grasscutter Stable Data", "grasscutter_stable_data": "Download Grasscutter Stable Data",
"grasscutter_latest_data": "Download Grasscutter Latest Data", "grasscutter_latest_data": "Download Grasscutter Latest Data",
"grasscutter_stable_data_update": "Update Grasscutter Stable Data", "grasscutter_stable_data_update": "Update Grasscutter Stable Data",
@@ -63,7 +64,7 @@
"port_help_text": "Ensure this is the Dispatch server port, not the Game server port. This is almost always '443'.", "port_help_text": "Ensure this is the Dispatch server port, not the Game server port. This is almost always '443'.",
"game_help_text": "You do not need to use a separate copy to play with Grasscutter. This is for either downgrading to 2.6 or if you do not have the game installed.", "game_help_text": "You do not need to use a separate copy to play with Grasscutter. This is for either downgrading to 2.6 or if you do not have the game installed.",
"gc_stable_jar": "Download the current stable Grasscutter build, which includes jar file and data files.", "gc_stable_jar": "Download the current stable Grasscutter build, which includes jar file and data files.",
"gc_full_build": "Download a full Grasscutter build, including repo, jar, and resources. Is fully set up and does not require any other downloads from this menu.", "gc_fullbuild": "Download a full Grasscutter build, including repo, jar, and resources. Is fully set up and does not require any other downloads from this menu.",
"gc_dev_jar": "Download the latest development Grasscutter build, which includes jar file and data files.", "gc_dev_jar": "Download the latest development Grasscutter build, which includes jar file and data files.",
"gc_stable_data": "Download the current stable Grasscutter data files, which does not come with a jar file. This is useful for updating.", "gc_stable_data": "Download the current stable Grasscutter data files, which does not come with a jar file. This is useful for updating.",
"gc_dev_data": "Download the latest development Grasscutter data files, which does not come with a jar file. This is useful for updating.", "gc_dev_data": "Download the latest development Grasscutter data files, which does not come with a jar file. This is useful for updating.",
@@ -77,7 +78,7 @@
"akebi_name": "Akebi", "akebi_name": "Akebi",
"migoto_name": "Migoto", "migoto_name": "Migoto",
"reshade_name": "Reshade", "reshade_name": "Reshade",
"akebi": "Set Akebi Executable", "akebi": "Set Akebi/Acrepi Executable",
"migoto": "Set 3DMigoto Executable", "migoto": "Set 3DMigoto Executable",
"reshade": "Set Reshade Injector" "reshade": "Set Reshade Injector"
} }

View File

@@ -120,6 +120,9 @@ export class Main extends React.Component<IProps, IState> {
isDownloading: this.props.downloadHandler.getDownloads().filter((d) => d.status !== 'finished')?.length > 0, isDownloading: this.props.downloadHandler.getDownloads().filter((d) => d.status !== 'finished')?.length > 0,
}) })
}, 1000) }, 1000)
// Summon the news when loaded since it will not show until click normally
NewsSection.showNews()
} }
async openExtrasMenu(playGame: () => void) { async openExtrasMenu(playGame: () => void) {

View File

@@ -215,9 +215,9 @@ export default class Downloads extends React.Component<IProps, IState> {
<div className="DownloadMenuSection" id="downloadMenuContainerGCFullBuild"> <div className="DownloadMenuSection" id="downloadMenuContainerGCFullBuild">
<div className="DownloadLabel" id="downloadMenuLabelGCFullBuild"> <div className="DownloadLabel" id="downloadMenuLabelGCFullBuild">
<Tr <Tr
text={this.state.grasscutter_set ? 'downloads.grasscutter_full_build' : 'downloads.grasscutter_full_build_update'} text={this.state.grasscutter_set ? 'downloads.grasscutter_fullbuild' : 'downloads.grasscutter_fullbuild_update'}
/> />
<HelpButton contents="help.gc_full_build" /> <HelpButton contents="help.gc_fullbuild" />
</div> </div>
<div className="DownloadValue" id="downloadMenuButtonGCFullBuild"> <div className="DownloadValue" id="downloadMenuButtonGCFullBuild">
<BigButton <BigButton

View File

@@ -40,8 +40,7 @@ export default class NewsSection extends React.Component<IProps, IState> {
super(props) super(props)
this.state = { this.state = {
// Set to commits since latest doesn't show any real info anyways selected: props.selected || 'commits',
selected: 'commits',
} }
this.setSelected = this.setSelected.bind(this) this.setSelected = this.setSelected.bind(this)