Grasscutters/Cultivation
1
0
Fork 0
mirror of https://github.com/Grasscutters/Cultivation.git synced 2025-03-02 17:35:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
468 Commits 19 Branches 27 Tags
Commit Graph

468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SpikeHD
43a6348b7a cleanup 2022-07-25 18:28:06 -07:00
SpikeHD
cc74107dfe move help buttons to alerts 2022-07-25 18:26:04 -07:00
SpikeHD
afa40f437f english fallback when using other languages 2022-07-25 18:13:37 -07:00
SpikeHD
a06a8af7df Merge branch 'main' of github.com:Grasscutters/Cultivation 2022-07-24 16:43:59 -07:00
SpikeHD
818896c734
Merge pull request #42 from Seeker14491/cpp-fix 
Don't throw C++ exceptions into Rust
 2022-07-23 17:12:52 -07:00
SpikeHD
3b6225d5f0
Merge pull request #43 from trollerr/patch-1 
Update Vietnamese translation
 2022-07-23 15:10:27 -07:00
Trollerr
041a6cb768
typo 2022-07-23 22:03:44 +07:00
Trollerr
acb6de85ad
Update Vietnamese translation 2022-07-23 22:00:31 +07:00
SpikeHD
cd628b4f3d open with cwd, restore akebi option stuff 2022-07-21 19:49:51 -07:00
SpikeHD
19d939a074 remove migoto for now 2022-07-21 19:41:00 -07:00
Brian Bowman
aeaa7ef76c Don't throw C++ exceptions into Rust 2022-07-21 18:03:43 -05:00
Brian Bowman
7659e9831a Remove unused metadata-related things 2022-07-21 17:43:30 -05:00
SpikeHD
22a416ebd8
Fix elementIds.md 2022-07-21 09:55:44 -07:00
SpikeHD
dcc9749967
Merge pull request #40 from Seeker14491/prettier 
Add prettier formatter
 2022-07-21 09:50:21 -07:00
Brian Bowman
7f9ba66e38 Add lint:fix script 2022-07-19 20:47:11 -05:00
Brian Bowman
f260379fa2 Add formatting pre-commit hook 2022-07-19 20:47:11 -05:00
Brian Bowman
544c39168b Add prettier check to CI 2022-07-19 20:47:11 -05:00
Brian Bowman
eb9aa34323 Run prettier formatter 2022-07-19 20:47:11 -05:00
Brian Bowman
e9df0f17db Tweak .editorconfig and line endings 
- Use `lf` line endings everywhere. This works fine even on Windows, and is more common for git repos. It also matches prettier's default.

For .editorconfig:

- Remove `insert_final_newline = false`: Omitting the final newline isn't supported by prettier or rustfmt.
- Remove `trim_trailing_whitespace = false`: The formatters will remove trailing whitespace anyways. I can't think of a good reason to want to keep trailing whitespace.
- Remove other redundant options.
 2022-07-19 20:42:43 -05:00
Brian Bowman
bf2ae51fb0 Add prettier formatter 2022-07-19 20:42:43 -05:00
SpikeHD
dc20fe5916 set proxy addr only when launching with proxy v1.0.4-alpha 2022-07-19 17:52:17 -07:00
SpikeHD
1a6ed38f8f only unpatch when game was patched automatically 2022-07-19 17:49:40 -07:00
SpikeHD
d23d5e3806 version bump! 2022-07-19 17:45:13 -07:00
SpikeHD
365a4f2888 spanish translation 2022-07-19 17:43:31 -07:00
SpikeHD
e270c886db 3dm support that doesn't actually work I just don't wanna fix it 2022-07-19 17:40:22 -07:00
SpikeHD
18a1b0e94c Merge branch 'main' of github.com:Grasscutters/Cultivation 2022-07-19 17:14:59 -07:00
SpikeHD
3799ec648d make proxy optional 2022-07-19 17:14:55 -07:00
SpikeHD
8ff06f6d29 make metadata optional 2022-07-19 17:07:10 -07:00
SpikeHD
6ff1ef932c
Merge pull request #35 from ffauzan/patch-1 
Fix toggle encryption
 2022-07-19 09:11:59 -07:00
SpikeHD
9e29135376
Merge pull request #38 from ffauzan/patch-2 
Fix patched metadata checking
 2022-07-19 09:10:09 -07:00
ffauzan
109f98db66
Fix patched metadata checking 
Issue: The function checked the wrong directory for global-metadata-patched.dat
 2022-07-19 16:41:25 +07:00
ffauzan
69201bc8b1
Update file_helpers.rs 2022-07-19 11:52:12 +07:00
ffauzan
656fa2cfe3 Revert "fix conflict" 
This reverts commit 1588bee5a3c8be20153259229dbe91ac7a906f9d, reversing
changes made to 75b79d02027adddd8dea52b5f6f82d6f5d583d52.
 2022-07-19 11:47:38 +07:00
Ffauzan
1588bee5a3 fix conflict 2022-07-19 11:27:28 +07:00
Ffauzan
75b79d0202 Merge branch 'Grasscutters-main' into patch-1 2022-07-19 11:04:03 +07:00
Ffauzan
6d9f1af134 Merge branch 'main' of https://github.com/Grasscutters/Cultivation into Grasscutters-main 2022-07-19 11:03:51 +07:00
SpikeHD
d38459bb8a
Merge pull request #37 from Seeker14491/patch-1 
Fix lints, update deps, clean readme
 2022-07-18 18:06:24 -07:00
ffauzan
c7954d2294
Update file_helpers.rs 2022-07-19 06:39:29 +07:00
Brian Bowman
adbb8e380d Clean up readme 2022-07-18 18:01:08 -05:00
Brian Bowman
4ff9e88185 Update dependencies 2022-07-18 18:01:08 -05:00
Brian Bowman
27a10c58ca Fix lints 2022-07-18 18:01:08 -05:00
ffauzan
44b148f2a4
Fix toggle encryption 
Open the config file in write mode so the toggle encryption button is actually working
 2022-07-18 22:03:01 +07:00
SpikeHD
6434814d1d fix decryption 2022-07-17 00:08:31 -07:00
SpikeHD
043f3e7ce4 simplify metadata processes 2022-07-16 23:34:55 -07:00
SpikeHD
61ac332cee Log paths on copy error v1.0.3-alpha 2022-07-16 22:56:01 -07:00
SpikeHD
a1284cc2ff path_bufs for file helpers 2022-07-16 22:06:26 -07:00
SpikeHD
cf82e9e892 use path bufs for copying files 2022-07-16 22:02:21 -07:00
SpikeHD
bb1874d64a Merge branch 'main' of https://github.com/Grasscutters/Cultivation 2022-07-16 21:26:07 -07:00
SpikeHD
85c0e2473b 2.8 resources download 2022-07-16 21:26:00 -07:00
SpikeHD
9e3b584608
Update README.md 2022-07-16 21:23:28 -07:00