1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-09-05 07:38:08 +03:00

6319 Commits

Author SHA1 Message Date
Phoebe
680b2b6203 Merge pull request #2233 from HullSeals/fix/2232/edsm-preferences
[2232] Fix Missing Preferences
2024-05-14 12:37:20 +02:00
David Sangrey
2686b23b3b Merge branch 'develop' into enhancement/1801/FDEV-ID-Updater 2024-05-13 20:21:42 -04:00
David Sangrey
99a0cc9eea Merge branch 'develop' into enhancement/806/system-profiler 2024-05-13 20:20:44 -04:00
David Sangrey
15ce8c1f2d Merge branch 'develop' into enhancement/1462/loadmodule-replacement 2024-05-13 20:13:52 -04:00
David Sangrey
1e1ab64b1a Merge branch 'develop' into enhancement/519/add-beta 2024-05-13 20:13:45 -04:00
David Sangrey
5099093682 Merge branch 'develop' into fix/2232/edsm-preferences 2024-05-13 20:13:35 -04:00
Phoebe
95fa67ca86 Merge pull request #2210 from HullSeals/enhancement/1173/right-click-provider-options
[1173] Add Right-Click Menu to UI Elements
2024-05-14 01:48:54 +02:00
David Sangrey
af891c85a8 Merge pull request #2211 from HullSeals/enhancement/2203/add-global-exception-handling
[2203] Implement Total Exception Handling
2024-05-13 19:47:27 -04:00
David Sangrey
44f809f9c5 Merge branch 'develop' into enhancement/2203/add-global-exception-handling 2024-05-13 19:47:20 -04:00
David Sangrey
459881d618 [1173] Fix Circular Import 2024-05-13 19:45:53 -04:00
Phoebe
64cd5b3cc5 [1173] Add alt_URL check 2024-05-14 01:42:26 +02:00
David Sangrey
6f9707cead Merge branch 'develop' into enhancement/1173/right-click-provider-options 2024-05-13 19:13:43 -04:00
David Sangrey
b8e8972d14 Merge pull request #2213 from HullSeals/fix/2166/update-watchdog-typehints
[2166] Update Watchdog Type Hints
2024-05-13 19:11:14 -04:00
David Sangrey
99a23d40cd Merge branch 'develop' into fix/2166/update-watchdog-typehints 2024-05-13 19:11:04 -04:00
David Sangrey
9b6570d600 Merge pull request #2226 from HullSeals/enhancement/830/use-native-file-opener
[830] Open Log Folder Natively
2024-05-13 19:10:36 -04:00
David Sangrey
6712bc3acb Merge branch 'develop' into enhancement/830/use-native-file-opener 2024-05-13 19:10:23 -04:00
David Sangrey
3e0d6e5b65 Merge pull request #2212 from HullSeals/enhancement/1654/add-shiprange-and-cargocapacity
[1654] Add Ship Jump Range and Cargo Capacity to Inara
2024-05-13 19:08:45 -04:00
David Sangrey
452f2a27cd Merge branch 'develop' into enhancement/1173/right-click-provider-options 2024-05-13 10:32:01 -04:00
David Sangrey
df642a6135 Merge branch 'develop' into enhancement/2203/add-global-exception-handling 2024-05-13 10:31:57 -04:00
David Sangrey
79ed7bee66 Merge branch 'develop' into enhancement/1654/add-shiprange-and-cargocapacity 2024-05-13 10:31:52 -04:00
David Sangrey
78def8a1b9 Merge branch 'develop' into enhancement/1462/loadmodule-replacement 2024-05-13 10:31:15 -04:00
David Sangrey
2516d7b595 Merge branch 'develop' into enhancement/806/system-profiler 2024-05-13 10:31:11 -04:00
David Sangrey
8fb16e6c6c Merge branch 'develop' into enhancement/519/add-beta 2024-05-13 10:30:33 -04:00
David Sangrey
b2a45e4e0f Merge branch 'develop' into fix/2232/edsm-preferences 2024-05-13 10:30:17 -04:00
David Sangrey
8e8d3491f6 Merge pull request #2189 from aussig/enhancement/2188/translation-override
[2188] Support Translation Language Override
2024-05-13 10:23:51 -04:00
David Sangrey
36d8333faf Merge pull request #2234 from EDCD/submodule-change/9062855101
[Auto-generated] Submodule Updates 9062855101
2024-05-13 08:51:32 -04:00
github-actions
fb6206279a updating submodules 2024-05-13 12:27:39 +00:00
David Sangrey
eece4c2ba7 [2232] Set EDSM Settings 2024-05-12 23:18:24 -04:00
David Sangrey
ad16f0666d [2232] Fix Missing Preferences
Fixes an issue that could present on clean installs where the EDSM keys weren't generated properly.

When the heck did this bug get introduced???
2024-05-12 23:16:45 -04:00
aussig
2dba5e4365 Merge branch 'develop' into enhancement/2188/translation-override 2024-05-12 13:34:42 +01:00
Phoebe
456db7b132 Merge pull request #2208 from HullSeals/enhancement/2198/test-dependencies
LGTM
2024-05-12 00:21:17 +02:00
David Sangrey
75f8df35e7 Merge branch 'develop' into enhancement/1173/right-click-provider-options 2024-05-11 18:19:53 -04:00
David Sangrey
ab700edda7 Merge branch 'develop' into enhancement/2203/add-global-exception-handling 2024-05-11 18:19:19 -04:00
David Sangrey
ad28977c44 Merge branch 'develop' into enhancement/806/system-profiler 2024-05-11 18:18:39 -04:00
David Sangrey
af8ebb4be4 Merge branch 'develop' into enhancement/519/add-beta 2024-05-11 18:18:20 -04:00
David Sangrey
c076c0329b Merge branch 'develop' into enhancement/2198/test-dependencies 2024-05-11 18:18:00 -04:00
Phoebe
7f06e37763 Merge pull request #2209 from HullSeals/enhancement/1812/rename_translations
LGTM
2024-05-12 00:16:45 +02:00
David Sangrey
37b13fd81d [5.10.6] Update XML 2024-05-11 18:10:32 -04:00
David Sangrey
f90dfb9425 Merge branch 'stable' into releases 2024-05-11 18:04:28 -04:00
David Sangrey
8f4d2b85d0 Merge branch 'main' into stable 2024-05-11 18:00:52 -04:00
David Sangrey
d1d31b1410 Merge branch 'beta' 2024-05-11 18:00:39 -04:00
David Sangrey
8b7923e186 [RELEASE] 5.10.6 Release/5.10.6 2024-05-11 17:58:56 -04:00
David Sangrey
6032e5202d [RELEASE] 5.10.6 2024-05-11 17:58:39 -04:00
David Sangrey
163fd197e7 Merge pull request #2231 from HullSeals/fix/2228/add-sco
[2228] Add SCO Modules and Preliminary Python Mk II Support
2024-05-11 17:20:48 -04:00
David Sangrey
a9370dc038 Merge pull request #2231 from HullSeals/fix/2228/add-sco
[2228] Add SCO Modules and Preliminary Python Mk II Support
2024-05-11 17:20:10 -04:00
David Sangrey
6ffcd91de5 [2228] Add PyMkII Armor Details
From upcoming Coriolis data
2024-05-10 17:49:13 -04:00
David Sangrey
e5f99c2954 [#2228] Add SCO Module Information 2024-05-08 21:56:52 -04:00
David Sangrey
b2cbd8a673 Merge branch 'develop' into enhancement/519/add-beta 2024-05-07 18:59:54 -04:00
David Sangrey
37c6179272 Update edmarketconnector.xml 2024-05-07 18:18:13 -04:00
David Sangrey
eec2254769 Merge branch 'stable' into releases 2024-05-07 18:14:47 -04:00