Commit Graph

919 Commits

Author SHA1 Message Date
Thoronium
4d98cd9468 Fix comparison
Some checks failed
Build / build-win (push) Has been cancelled
Build / build-ubuntu (push) Has been cancelled
Check frontend / prettier-tsc-eslint-checks (push) Has been cancelled
2024-10-31 02:11:46 -06:00
Thoronium
2ed97f9787
Merge pull request #210 from Grasscutters/dependabot/npm_and_yarn/babel/traverse-7.23.2
Bump @babel/traverse from 7.18.9 to 7.23.2
2024-10-31 02:04:24 -06:00
Thoronium
1a82ab0012 Clippy ubuntu
Some checks failed
Build / build-win (push) Waiting to run
Build / build-ubuntu (push) Waiting to run
Check frontend / prettier-tsc-eslint-checks (push) Waiting to run
Check backend / rustfmt (push) Has been cancelled
Check backend / clippy (ubuntu-latest) (push) Has been cancelled
Check backend / clippy (windows-latest) (push) Has been cancelled
2024-10-30 16:47:59 -06:00
Thoronium
017c116d81 Merge branch 'main' of https://github.com/Grasscutters/Cultivation 2024-10-30 16:31:15 -06:00
Thoronium
422ce59f96 Clippy 2024-10-30 16:31:09 -06:00
Thoronium
02a304d830
Remove clippy for macos
Macos not supported, can add back if it ever is.
2024-10-30 16:06:57 -06:00
Thoronium
ae8c03debe
Update README.md
Fix link
2024-10-30 15:39:21 -06:00
Thoronium
dcc2b1707b
Update THEMES.md
Some checks are pending
Check backend / rustfmt (push) Waiting to run
Check backend / clippy (macos-latest) (push) Waiting to run
Check backend / clippy (ubuntu-latest) (push) Waiting to run
Check backend / clippy (windows-latest) (push) Waiting to run
Build / build-win (push) Waiting to run
Build / build-ubuntu (push) Waiting to run
Check frontend / prettier-tsc-eslint-checks (push) Waiting to run
Update link
2024-10-30 14:36:59 -06:00
Thoronium
8ba916d1ea
Add ExampleTheme.zip
To replace expired discord link for theming reference.
2024-10-30 14:36:10 -06:00
Thoronium
4b6d1a11fb
Merge pull request #235 from NotThorny/Merge-Compat
Merge Thorny Edition changes
2024-10-30 14:25:19 -06:00
Thoronium
2b95034ddb
Update README.md
Fix discord invite
Clarify AIO download is one or the other
2024-10-30 13:41:44 -06:00
Thoronium
989487b381 Lint & Prettier 2024-10-30 13:32:09 -06:00
Thoronium
f6f5eae31c Changes from 1.2.1 - 1.5.1
Contains slightly modified commits from between 1.2.1 and 1.5.1.
2024-10-30 13:18:07 -06:00
SpikeHD
31c60755af
Merge pull request #215 from daydreamer-json/patch-1
Add Japanese language support
2023-12-23 19:42:29 -08:00
SpikeHD
22a2fff644
Merge pull request #217 from NotThorny/Fixes
Bugfixes
2023-12-23 19:42:06 -08:00
Thoronium
d11e432e76 Remove offline mode check
Forgot offline mode wasn't merged
2023-11-27 15:45:21 -07:00
Thoronium
572006ff95 Fix failing to launch on missing arg 2023-11-27 15:36:34 -07:00
Thoronium
27148eac8e Fix wrench loading
Fix game missing notification
2023-11-27 15:36:26 -07:00
Thoronium
7dce15f553 Only detect game path on windows 2023-11-27 15:30:35 -07:00
daydreamer-json
1204f967d7
Fix README_ja-JP.md
Corrected translation errors
2023-11-20 06:44:42 +09:00
daydreamer-json
51b938a5da
Fix README.md 2023-11-20 05:04:48 +09:00
daydreamer-json
0def90223f
README Japanese translation 2023-11-20 05:02:54 +09:00
daydreamer-json
f6de90ca50
Create ja.json 2023-11-20 02:47:19 +09:00
dependabot[bot]
e1ba27203a
Bump @babel/traverse from 7.18.9 to 7.23.2
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.18.9 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-18 06:23:42 +00:00
SpikeHD
6a161f4539
Merge pull request #205 from Grasscutters/dependabot/cargo/src-tauri/webpki-0.22.2
Bump webpki from 0.22.0 to 0.22.2 in /src-tauri
2023-10-03 15:35:19 -07:00
dependabot[bot]
5b6f4e94db
Bump webpki from 0.22.0 to 0.22.2 in /src-tauri
Bumps [webpki](https://github.com/briansmith/webpki) from 0.22.0 to 0.22.2.
- [Commits](https://github.com/briansmith/webpki/commits)

---
updated-dependencies:
- dependency-name: webpki
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 21:36:39 +00:00
SpikeHD
a32d7186df
Merge pull request #204 from NotThorny/Fix-SettingsArgs
Fix args in settings
2023-10-01 01:58:48 -07:00
Thoronium
680c6b04a4 Remove unnecessary passing of args 2023-09-28 13:17:48 -06:00
Thoronium
5db28756d2 Fix launch args setting 2023-09-28 13:13:34 -06:00
SpikeHD
6d53f344ac
Merge pull request #202 from NotThorny/Settings-LaunchArgs
Settings & QoL Alerts
2023-09-18 13:25:15 -07:00
Thoronium
d144b2dc94
Remove forgotten debug 2023-09-16 21:31:21 -06:00
Thoronium
7264331436 Update langs 2023-09-16 21:26:46 -06:00
Thoronium
016d377f30 Fix display input 2023-09-16 21:26:46 -06:00
Thoronium
0e2b4a4a54 Small fixes 2023-09-16 21:26:46 -06:00
Thoronium
a1571ad800 Launch args from settings 2023-09-16 21:26:46 -06:00
Thoronium
d849ea32c9 Add encryption alert 2023-09-16 21:26:46 -06:00
Thoronium
1c7293578c Update folder check 2023-09-16 21:26:46 -06:00
Thoronium
73a9e18712 Add webcache clearing 2023-09-16 21:26:46 -06:00
Thoronium
96bf4ef3fe Checks for localhost
Linting
2023-09-16 21:26:46 -06:00
SpikeHD
4c5b79513a
Merge pull request #201 from NotThorny/Exit-Proceedures
Fix Closure Stuff
2023-09-10 00:32:18 -07:00
Thoronium
b222601cf1 Close handling 2023-09-09 22:33:16 -06:00
SpikeHD
f8d2e62a06
Merge pull request #199 from RealShuru/patch-1
Update de.json
2023-09-09 15:57:02 -07:00
RealShuru
33547cd34e
Update de.json 2023-09-09 00:26:32 +02:00
SpikeHD
a29fdf3d9c fix(all): version bump 2023-09-07 17:47:15 -07:00
SpikeHD
a86055cce9
Merge pull request #195 from fnr1r/linux/main
Linux support
2023-09-07 17:20:26 -07:00
SpikeHD
014641307e
Merge pull request #198 from root-mega/main
Fix spanish translation
2023-09-01 12:02:38 -07:00
mega
51da474b2a
Fix spanish translation 2023-09-01 20:58:01 +02:00
mega
97bbfea694
Update es.json 2023-09-01 20:51:45 +02:00
SpikeHD
1d4cf94643
Merge pull request #197 from NotThorny/Config-Fix
Fix crashing on null configs
2023-08-30 12:24:44 -07:00
Thoronium
843913a664 Fix crashing on null configs 2023-08-29 15:54:09 -06:00