Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4.0.0-RC1 #232

Merged
merged 49 commits into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2793860
new zip library, first test.
jtsage Feb 14, 2024
4e02834
fix test name
jtsage Feb 14, 2024
6e4503f
Add extra benchmark bits
jtsage Feb 14, 2024
0997057
Finish ditch of admzip
jtsage Feb 14, 2024
4c93fd3
de-duplicate
jtsage Feb 14, 2024
44fb981
Begin code documentation
jtsage Feb 14, 2024
c518a35
more code doc
jtsage Feb 14, 2024
39a4f9e
small tweaks to l10n to make it slightly more efficient
jtsage Feb 14, 2024
0377799
Make clean cache more visual
jtsage Feb 14, 2024
917d273
More docs.
jtsage Feb 14, 2024
e4a1c55
more doc
jtsage Feb 14, 2024
4e195bb
more docs
jtsage Feb 15, 2024
f2188f7
more doc
jtsage Feb 15, 2024
b0a9992
Merge branch 'main' into v-newZIP
jtsage Feb 15, 2024
1a82c83
armor this better
jtsage Feb 15, 2024
f4cc2b8
more doc.
jtsage Feb 15, 2024
d83c367
add JSON export (and fix a game.xml error)
jtsage Feb 15, 2024
3577c42
More JSON export work
jtsage Feb 15, 2024
2224100
Update modAssist_func_lib.js
jtsage Feb 15, 2024
5a694d8
Add extra error checking for local save manager
jtsage Feb 16, 2024
007142c
Test build outside main branch? (if so, 4.0.0-alpha1
jtsage Feb 16, 2024
913f130
add visual indicator of running dev copy.
jtsage Feb 18, 2024
7840ee4
Update translations.
jtsage Feb 19, 2024
19a8b82
Fix icons on light-mode displays. (bad check) #222
jtsage Mar 23, 2024
137a050
Fix removing an external site record. #222
jtsage Mar 23, 2024
6e22098
Add "Select All" to simple cut/copy/paste context menu
jtsage Mar 23, 2024
a9e4c0e
Update icons (fill types)
jtsage Mar 23, 2024
f8363c0
Missed a few.
jtsage Mar 23, 2024
3c8e019
update background for dev mode
jtsage Mar 24, 2024
2ed4ac1
Track window scroll when editing folders. Re: #228
jtsage Mar 24, 2024
5808df0
Fix tooltips on removing collection
jtsage Mar 24, 2024
789987e
Add game.xml backup option.
jtsage Mar 24, 2024
d73e920
make backup every time we read it successfully (game.xml)
jtsage Mar 24, 2024
3058369
Add backup option for gameSettings.xml too
jtsage Mar 24, 2024
3cd8c7e
Add a few crops to the calendar
jtsage Mar 24, 2024
04ff0c7
Update dependencies. Closes #229
jtsage Mar 24, 2024
cc3e016
Fix some test
jtsage Mar 24, 2024
5559e81
Bump to 3.9.72 (4.0.0-alpha2)
jtsage Mar 24, 2024
5bf72af
Upstream translation merge - also clears #231
jtsage Mar 27, 2024
7d28eef
Fix map PDA images.
jtsage Mar 28, 2024
55fbc2b
Fix folder based mods.
jtsage Mar 28, 2024
8949ebd
add special alert for altering details of the active collection.
jtsage Mar 28, 2024
004d694
Add JSON collection import feature
jtsage Mar 29, 2024
8669cb6
Update dependencies
jtsage Mar 29, 2024
9863f02
Bump to 3.9.81 (4.0.0-beta1)
jtsage Mar 29, 2024
71143ae
Update ru.json
jtsage Mar 30, 2024
6c2c387
Fix collection color import.
jtsage Mar 30, 2024
b725bee
Add documentation for collection import/export
jtsage Mar 30, 2024
ed7426b
bump packages.
jtsage Mar 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ test/bgBuilder/*
.VSCodeCounter
TEST_OUTPUT.md
.deepl_key
jsdoc_server/
22 changes: 22 additions & 0 deletions .jsdoc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"tags": {
"allowUnknownTags": false
},
"source": {
"include": ["./modAssist_main.js", "./lib"]
},
"plugins": [
"plugins/markdown"
],
"opts": {
"template": "node_modules/docdash/",
"encoding": "utf8",
"destination": "jsdoc_server/",
"recurse": true,
"verbose": true
},
"templates": {
"cleverLinks": false,
"monospaceLinks": false
}
}
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"deepl",
"DESCVERSION",
"digestate",
"docdash",
"dollys",
"drygrass",
"DXGI",
Expand Down Expand Up @@ -123,6 +124,7 @@
"iconfilename",
"IMAGEFILENAME",
"IMAGENAME",
"importjson",
"incomeperhour",
"ingame",
"inputbinding",
Expand Down Expand Up @@ -205,6 +207,7 @@
"progressbar",
"pycache",
"reallights",
"redcabbage",
"Rescan",
"roadsalt",
"Rottne",
Expand All @@ -214,6 +217,7 @@
"savedate",
"savegame",
"savegamename",
"savegames",
"savemanage",
"savetrack",
"SCCS",
Expand Down Expand Up @@ -255,6 +259,7 @@
"Vicon",
"wheelconfiguration",
"wheelconfigurations",
"whitecabbage",
"windrowers",
"woodchips",
"workingwidth",
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed .yarn/cache/glob-npm-8.1.0-65f64af8b1-92fbea3221.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified docs/img340/context-collection.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img340/import-step-0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img340/import-step-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/img340/import-step-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions docs/importexport.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,65 @@ Next to each collection is a small `CSV` icon <i class="bi bi-filetype-csv"></i>
You can drag single mods from the collection area to any valid target in windows. Valid targets are the desktop, an explorer window, and any number of third party apps that support dragging a file directly to them (for example, Discord)

![Alt text](img340/drag-drop-export.png)

## Import & Export of Collections

There is support for importing and exporting collection settings.

### Export Collection

Right click on the collection, and choose "Export Settings (JSON)"

![context](img340/context-collection.png)

---

### Altering Export Details

The import / export JSON format is defined below. Most of the options are directly from the collection detail settings, the two additional fields are available for single mod download (no unzip) and mod pack download (unzip) at import time.

```json
{
"collection_color": 6,
"collection_description": "Test Import Server",
"download_direct": [
"https://example.net/my_mod_collection.zip"
],
"download_unzip": [
"https://example.net/FS22_SingleMod.zip"
],
"force_frozen": true,
"game_version": 22,
"server_downloads": false,
"server_id": "1-2-3-4",
"server_name": "server-name",
"server_password": "server-join-password",
"server_website": "http://example.net/"
}
```

---

### Import Collection

To import a collection drag-and-drop the JSON file to the Mod Assistant window. A New window will appear

The first section of the window will give you an overview of the collection being imported.

![overview](img340/import-step-0.png)

#### Step 1

First, select where on disk you would like to store the collection. You can use an existing folder (for instance, if updating a collection, or you already made the folder), or, you can create a new folder in the dialog that appears.

![step 1](img340/import-step-1.png)

Once you have selected the folder, press the "Apply Settings" button to apply the included settings. The button becomes enabled after selecting a location, and turns green when it is finished.

#### Step 2 (optional)

Optionally, you can include one-time downloads in an exported collection JSON file - if you do, they are available to download here. The buttons become available once you have selected a location on disk to store the collection. The buttons turn green when they are finished. Please note that these downloads will overwrite any existing files.

![step 2](img340/import-step-2.png)

Mod pack style downloads will be unzipped after download, single mods will just be stored in the collection folder.
Loading
Loading