prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
3730 commits 54 branches 60 tags 136 MiB
Commit graph

1271 commits

Author SHA1 Message Date
Jeremy Wu
22bdbc9367 add match on path 2021-02-15 08:19:48 +11:00
Jeremy Wu
ba5cb5788e remove unused variables 2021-02-15 07:18:16 +11:00
Jeremy Wu
2b6b5e9d8b version bump 2021-02-15 07:05:46 +11:00
Jeremy Wu
f78ba8e79e Merge branch 'dev' into fix_win32_loading 2021-02-15 06:51:58 +11:00
Jeremy Wu
93f4b6d90a update to use SetDataObject 2021-02-14 20:32:20 +11:00
Jeremy Wu
f9b8216e3b add copy bookmark's url to clipboard 2021-02-14 19:00:00 +11:00
Jeremy Wu
7c2c78733e version bump PluginsManager 2021-02-13 21:41:56 +11:00
Jeremy Wu
0707ae3997 fix formattng 2021-02-13 21:03:26 +11:00
弘韬 张
59a767fafb remove unexpected space 2021-02-13 12:22:59 +08:00
弘韬 张
9df7201037 Remove setting after uninstalling plugin 2021-02-12 23:47:21 +08:00
弘韬 张
b4bc4f0d24 address a weird bug 2021-02-12 03:18:38 +08:00
弘韬 张
a37f1918ae Update all profile to dotnet 5 2021-02-12 03:17:13 +08:00
弘韬 张
276395e5f4 Use customized distinctBy instead of customized equalitycomparator 2021-02-09 15:59:55 +08:00
Jeremy Wu
8fa843ea45 fix incorrect icopath context menu 2021-02-08 21:05:50 +11:00
张弘韬
a4160a14e8 Merge remote-tracking branch 'upstream/dev' into fix_win32_loading 
# Conflicts:
#	Plugins/Flow.Launcher.Plugin.Program/Programs/Win32.cs
 2021-02-08 13:00:22 +08:00
张弘韬
70db600c9f optimize format 2021-02-08 12:56:40 +08:00
张弘韬
2b9823a7ac Use Customized Except for removing disabled source 2021-02-08 12:49:27 +08:00
kubalav
988c265811 enhanced translation 2021-02-05 12:22:00 +01:00
kubalav
c8321c9771 Update Slovak translation 2021-02-05 12:08:36 +01:00
Jeremy Wu
bcf046f842 fix move method call only restricted to within the same drive 2021-02-03 20:51:19 +11:00
弘韬 张
1f6e6e5e09 fix format 2021-02-03 10:25:29 +08:00
弘韬 张
a65db9b626 Merge Dev 2021-02-03 10:24:03 +08:00
弘韬 张
71664bddc0 Optimize Logic 2021-02-03 10:23:38 +08:00
Jeremy Wu
a6e5602520 formatting fix 2021-02-03 13:00:16 +11:00
Jeremy Wu
f17b7cc355 Merge remote-tracking branch 'origin/dev' into FixUnexpectedErrorNotice 2021-02-03 12:56:43 +11:00
Jeremy Wu
1ec5023fc4
Merge pull request #318 from taooceros/ResultManagerSingleton 
Make most class in Explorer plugin become static class
 2021-02-03 09:06:35 +11:00
Jeremy Wu
10c72cecc2 version bump Explorer 2021-02-03 09:02:38 +11:00
Jeremy Wu
2602cc05c0 version bump Program plugin 2021-02-02 20:30:58 +11:00
Jeremy Wu
4331398932 update summary, comments & formatting 2021-02-02 20:28:52 +11:00
Jeremy Wu
d9a4836118 remove spacing 2021-02-02 05:50:27 +11:00
弘韬 张
19918244ad fix a using 2021-02-01 19:59:56 +08:00
弘韬 张
f32cbaf331 Split name matching and desciption matching due to fuzzy change 2021-02-01 19:57:08 +08:00
弘韬 张
c875ad5277 Make most class in Explorer plugin become static class 2021-01-29 18:40:51 +08:00
弘韬 张
2271ec16fd Optimize exception message logic 2021-01-29 12:17:17 +08:00
弘韬 张
89453f441d Await Update when manifest is not ready 2021-01-29 12:09:18 +08:00
Jeremy Wu
4993edae2d fix formatting 2021-01-28 21:41:20 +11:00
Jeremy Wu
715aafd533 Merge branch 'dev' into AcronymFuzzy 2021-01-28 13:52:37 +11:00
Jeremy Wu
e615ad86d9 add remove from quick access in context menu 2021-01-27 20:55:53 +11:00
弘韬 张
c0f60e25bf Use type matching to create result 2021-01-27 16:23:59 +08:00
Jeremy Wu
8b698c4465 update to empty list 2021-01-27 07:42:43 +11:00
Jeremy Wu
b71203ccfa Merge branch 'dev' into add_file_quick_access 2021-01-27 07:00:39 +11:00
Jeremy Wu
5773829fae add tool tip for quick access context menu 2021-01-27 06:26:15 +11:00
Jeremy Wu
ccc677fd8f fix per comment 2021-01-27 06:17:24 +11:00
Jeremy Wu
f848e68b72 version bump Url and WebSearch 2021-01-27 05:35:17 +11:00
kubalav
f4ceb0e3e1 Update Slovak translation 2021-01-26 13:46:15 +01:00
Jeremy Wu
889c853e33 version bump Explorer plugin 2021-01-26 21:43:19 +11:00
Jeremy Wu
9331c80753 rename folder link to access link 2021-01-26 21:29:56 +11:00
Jeremy Wu
d90b6d23d3 add save after adding to quick access 2021-01-26 21:14:39 +11:00
Jeremy Wu
dd57bfc6f8 add backwards compatibility with old list 2021-01-26 21:09:35 +11:00
Jeremy Wu
82d91840c1 rename methods in quick access 2021-01-26 20:53:01 +11:00
Jeremy Wu
44b3f19ac4 fix typo 2021-01-26 20:48:06 +11:00
Jeremy Wu
c02fa4b847 rename ui elements 2021-01-26 20:46:05 +11:00
Jeremy Wu
324ee62c2a rename quick folder access links to quick access links 2021-01-26 20:35:02 +11:00
Jeremy Wu
3a1d40893e rename project items to quick access link naming 2021-01-26 20:31:55 +11:00
Jeremy Wu
cab7f94c6b context menu selection for adding to quick access 2021-01-26 20:21:12 +11:00
Jeremy Wu
85dee95fc7 add file and folder type loading 2021-01-26 20:01:12 +11:00
弘韬 张
67b0bfd73a Merge dev 2021-01-26 16:26:45 +08:00
弘韬 张
597dc06b31 revert unexpected personal change 2021-01-26 16:24:30 +08:00
弘韬 张
900f009893 Revert DotNet 5 update 2021-01-26 16:19:06 +08:00
弘韬 张
a918e7d9c9 Merge Dev 2021-01-26 15:49:30 +08:00
Jeremy Wu
e31bef7d3c fix formatting + naming 2021-01-26 18:01:39 +11:00
Jeremy Wu
7b999c53ff Merge branch 'dev' into PluginAPIExpand 2021-01-26 16:11:54 +11:00
Jeremy Wu
0c5d1669cb version bump for Url and WebSearch plugins 2021-01-26 15:38:23 +11:00
Jeremy Wu
934bad6ba5
Merge pull request #311 from taooceros/FixUntranslatedString 
Fix untranslated string
 2021-01-26 15:34:53 +11:00
弘韬 张
5d894ec154 Don't await download manifest when it is unavaliable, but only await when calling install method to allow user using uninstall when manifest is not ready. 2021-01-25 17:18:48 +08:00
Jeremy Wu
163bfa303b formatting and naming 2021-01-25 19:18:13 +11:00
Jeremy Wu
e46feb1165 fix formatting 2021-01-25 18:57:58 +11:00
张弘韬
8dc5def2e9 Remove extra whitespace 2021-01-25 11:19:59 +08:00
张弘韬
35782e4308 Version Bump 2021-01-25 11:17:28 +08:00
张弘韬
8a56cc6cd8 Use singleton in QuickFolderAccess.cs 2021-01-25 11:07:14 +08:00
张弘韬
9914124d20 Remove extra checking 2021-01-25 11:00:56 +08:00
Jeremy Wu
ff5e3695e9 add return if no quick access links or query 2021-01-25 13:50:41 +11:00
张弘韬
a721bd7de0 Merge remote-tracking branch 'upstream/dev' into PluginAPIExpand 
# Conflicts:
#	Flow.Launcher.Plugin/IPublicAPI.cs
 2021-01-25 05:36:40 +08:00
Jeremy Wu
647156ce6f Merge branch 'dev' into ExplorerPathAsync 2021-01-24 21:27:21 +11:00
Jeremy Wu
bfa1aabe35 add comment explaining why location check is needed 2021-01-24 21:08:48 +11:00
Jeremy Wu
e9462e8994 revert change from check string is path back to check location exists 2021-01-24 21:05:39 +11:00
Jeremy Wu
d583078a67 version bump Explorer 2021-01-24 20:52:39 +11:00
Jeremy Wu
288baa5538 Merge branch 'dev' into ExplorerDirectorySearchWithIndexFix 2021-01-24 20:52:10 +11:00
Jeremy Wu
cf60ce2b22 verision bump Explorer plugin 2021-01-24 20:26:29 +11:00
Jeremy Wu
4944a001d6 Merge remote-tracking branch 'origin/dev' into OrderByOpt 2021-01-24 20:24:49 +11:00
Jeremy Wu
a3a0623617
Merge pull request #312 from taooceros/autoReindex 
Auto reindex
 2021-01-24 19:50:56 +11:00
弘韬 张
267c796ad8 await indexing process in Program plugin 2021-01-23 12:40:10 +08:00
弘韬 张
3e6961dc9f automatically check whether we shall reindex when querying 2021-01-23 12:33:47 +08:00
弘韬 张
27c6db288e fix websearch plugin untranslated string 2021-01-23 12:28:04 +08:00
弘韬 张
98760d8aa2 Fix URL plugin untranslated string 2021-01-23 12:24:08 +08:00
taooceros
7d333aeaed
Merge pull request #298 from Flow-Launcher/exclude_chars_explorer 
Exclude index search from special chars
 2021-01-23 11:54:51 +08:00
弘韬 张
0fe92d35cb fix testing and a potential error coding 2021-01-23 11:32:41 +08:00
弘韬 张
bc0146e68b Use Window Search Orderby instead of getting the result and order them by filename 2021-01-23 10:53:01 +08:00
弘韬 张
3effb401b7 make it become an extension method 2021-01-22 16:23:18 +08:00
弘韬 张
1a758c3919 Use Token.throwifCancellationRequested 2021-01-21 19:39:18 +08:00
弘韬 张
9f8440b4b7 Merge remote-tracking branch 'upstream/dev' into ExplorerPathAsync 2021-01-21 12:16:22 +08:00
Jeremy Wu
49d5faee9e formatting 2021-01-21 13:41:50 +11:00
Jeremy Wu
4e7c9a76e8 version bump PluginsManager 2021-01-21 13:38:26 +11:00
Jeremy Wu
a939087367 Merge branch 'dev' into fix_errormsg_delay 2021-01-21 13:37:45 +11:00
弘韬 张
912cca6c5f Use callback to check whether downloading manifest successfully. 2021-01-20 18:00:16 +08:00
弘韬 张
cd92512fe5 Optimize code 2021-01-20 13:47:25 +08:00
弘韬 张
ba236dad63 Merge remote-tracking branch 'upstream/dev' into ExplorerPathAsync 2021-01-20 13:25:13 +08:00
Jeremy Wu
a0f611c7ba Merge branch 'dev' into exclude_chars_explorer 2021-01-19 13:16:38 +11:00
张弘韬
d7abae1ab2 Add Cancellation token for file system enumeration 2021-01-19 10:08:37 +08:00
Jeremy Wu
2463582af0 fix error message not working + increase delay 2021-01-19 08:52:12 +11:00
Jeremy Wu
ed1bf0e956 version bump Explorer plugin 2021-01-19 07:07:06 +11:00
Jeremy Wu
2643c7d730 exclude index search on special chars 2021-01-19 07:05:30 +11:00
Jeremy Wu
ff26bccba5 version bump plugins 2021-01-18 07:58:38 +11:00
Jeremy Wu
2fecfa2644 verison bump plugins manager 2021-01-18 07:44:43 +11:00
张弘韬
d35d7ae2d6 Remove unused catch and optimize code 2021-01-17 23:45:15 +08:00
张弘韬
61c1f2c620 Merge remote-tracking branch 'upstream/dev' into fix_win32_loading 2021-01-17 23:37:13 +08:00
张弘韬
415adb72bf Optimize Logic 2021-01-17 18:46:08 +08:00
张弘韬
d203a7a5f3 Add Cancellation Token 2021-01-17 18:42:01 +08:00
张弘韬
bf96a60862 Only wait PluginManifest downloading for 500ms to allow Flow to be used even without internet connection. 2021-01-17 18:39:53 +08:00
Jeremy Wu
e9e99ab338
Merge pull request #267 from taooceros/PluginAsyncModel 
Plugin async model
 2021-01-17 19:18:53 +11:00
Jeremy Wu
969265c24f fix formatting 2021-01-17 19:05:28 +11:00
Jeremy Wu
d741a98112 fixed last index time during init 2021-01-17 18:47:43 +11:00
Jeremy Wu
114c12bdaf formatting and description 2021-01-17 18:47:19 +11:00
弘韬 张
c54b678e6f Merge dev 2021-01-14 22:40:45 +08:00
Jeremy Wu
02211f2853
Merge pull request #288 from Flow-Launcher/pluginsmanager_versionbump 
Version bump for PluginsManager
 2021-01-14 19:57:40 +11:00
弘韬 张
8fe1fbcf48 Merge dev 2021-01-14 10:39:37 +08:00
Jeremy Wu
96fc1346a9
Merge pull request #276 from taooceros/PluginPriority 
Add Plugin Priority Settings
 2021-01-12 07:41:11 +11:00
Jeremy Wu
15a5bbabb8 version bump for PluginsManager 2021-01-10 13:17:40 +11:00
kubalav
16148d59d4 Fix Plugins Manager key name in Slovak translation 2021-01-09 13:24:18 +01:00
Jeremy Wu
777b0b954c Merge remote-tracking branch 'origin/dev' into PluginPriority 2021-01-09 17:11:03 +11:00
张弘韬
8bd6820088 Merge branch 'PluginAsyncModel' into dev 
# Conflicts:
#	Flow.Launcher/ViewModel/MainViewModel.cs
 2021-01-09 12:59:59 +08:00
张弘韬
494312a251 Merge dev 2021-01-09 11:04:36 +08:00
张弘韬
62009ac3fb Merge remote-tracking branch 'upstream/dev' into DotNet5Upgrade 
# Conflicts:
#	Flow.Launcher/Flow.Launcher.csproj
#	Plugins/Flow.Launcher.Plugin.Color/Flow.Launcher.Plugin.Color.csproj
#	Plugins/Flow.Launcher.Plugin.PluginManagement/Flow.Launcher.Plugin.PluginManagement.csproj
 2021-01-09 11:01:38 +08:00
kubalav
6d5ade4056 Plugins Manager Slovak translation 2021-01-08 09:44:26 +01:00
弘韬 张
8b813fef96 Merge remote-tracking branch 'upstream/dev' into PluginAPIExpand 2021-01-08 16:00:32 +08:00
弘韬 张
a8e4c504d0 Move MatchResult to Flow.Launcher.Plugin so that plugins can utilize main method 2021-01-08 15:52:45 +08:00
弘韬 张
c939924ec8 optimize code in searchsuggestions 2021-01-07 21:54:09 +08:00
弘韬 张
1003ce4160 move using to more specific place in Google.cs 2021-01-07 21:48:55 +08:00
弘韬 张
919d5d51ab add using for Bing search source 2021-01-07 21:47:31 +08:00
弘韬 张
971d374582 Merge Dev 2021-01-07 21:43:32 +08:00
弘韬 张
86a9cf31c5 Optimize Websearch code 2021-01-07 21:41:05 +08:00
弘韬 张
8a5f98a6a3 Manually handling TaskCancelledException in search suggestion to aviod stunt in debugging 2021-01-07 21:38:21 +08:00
弘韬 张
2b085dbcee Merge dev 2021-01-07 20:48:02 +08:00
Jeremy Wu
b348f1dc53
Merge pull request #253 from taooceros/UpdateJson 
Replace Json.Net with System.Text.Json
 2021-01-07 20:32:22 +11:00
弘韬 张
a4edbc2cb9 Move WebSearch to Async model 2021-01-07 11:09:08 +08:00
弘韬 张
a9aeecdabd Merge remote-tracking branch 'upstream/dev' into UpdateJson 2021-01-07 10:58:17 +08:00
Jeremy Wu
012d2d05f2 Merge remote-tracking branch 'origin/dev' into PluginPriority 2021-01-07 13:36:31 +11:00
Ioannis G
b3b64e1d2e
set SatelliteResourceLanguages for plugin projects 2021-01-07 00:53:57 +02:00
弘韬 张
e790e9474e Add Plugin Priority Settings 2021-01-05 16:11:38 +08:00
弘韬 张
bc63b9ebfa Change Download to DownloadAsync 
Add error handling for download as well
 2021-01-04 10:31:05 +08:00
Jeremy Wu
6287358275 update error message 2021-01-04 06:41:05 +11:00
Jeremy Wu
d35a3bb43d version bump for PluginsManager 2021-01-04 06:40:45 +11:00
弘韬 张
8fa1e2e33f add one more message 2021-01-03 20:49:14 +08:00
弘韬 张
d369108b0b Error handling for plugin update 2021-01-03 20:42:31 +08:00
弘韬 张
6e9e51ec4d Error handling for OperationCancelledException in Program plugin 2021-01-03 10:33:59 +08:00
弘韬 张
43cee65c45 Move PluginManagers to Async Model 2021-01-03 10:33:59 +08:00
弘韬 张
d7805d7a8c Make Explorer plugin completely async 2021-01-03 10:33:59 +08:00
张弘韬
f768b0890b Move Program Plugin to Async model 2021-01-03 10:33:59 +08:00
张弘韬
3cd609377e Plugin Async ModelAdd Full Async model, including AsyncPlugin and AsyncReloadable 2021-01-03 10:33:10 +08:00
Jeremy Wu
b4b30dd34d wait manifest update before proceeding 2021-01-02 18:06:44 +11:00
Jeremy Wu
661c64b1c2 version bump for PluginsManager 2021-01-02 17:00:10 +11:00
Jeremy Wu
97ac427517 add manual reload of PluginsManifest data 2021-01-02 16:58:23 +11:00
taooceros
3d9cd13bd6
Merge pull request #257 from Flow-Launcher/fix_error_capturing 
Fix error handling in PluginsManager and plugins query, fixed postbuild script duplicate deletion during build
 2021-01-02 10:41:35 +08:00
Jeremy Wu
08f97f0ef9 change csproj images folder to use wildcard 2021-01-02 12:57:13 +11:00
Jeremy Wu
be1776fd21 version bump for plugins 2021-01-02 12:47:20 +11:00
Ioannis G
f3355c525d
fix: properly include all plugin translation files 2021-01-01 23:15:37 +02:00
Jeremy Wu
81cb20bf91 add return to continue 2021-01-01 21:54:34 +11:00
Jeremy Wu
878f7bf5df version bump for PluginsManager 2021-01-01 19:49:19 +11:00
Jeremy Wu
cab1b93183 move install method into try catch 2021-01-01 19:13:14 +11:00
Jeremy Wu
54f6858937 add plugin name to error msg popup 2021-01-01 19:03:06 +11:00
Jeremy Wu
a65e17dba0 fix wrong error message 2021-01-01 18:57:58 +11:00
Jeremy Wu
5c17cb6e9b version bump WebSearch 2020-12-31 15:44:57 +11:00
Jeremy Wu
82a3143cfa Merge branch 'dev' into addBingSearchSuggestion 2020-12-31 15:37:50 +11:00
弘韬 张
a139a040ec add bing search suggestion 2020-12-30 20:24:01 +08:00
弘韬 张
a0c4cc3575 use ParseAsync in Google 2020-12-30 19:09:52 +08:00
弘韬 张
d28b14ff2d Replace All use of Json.Net with System.Text.Json 2020-12-30 13:40:42 +08:00
Jeremy Wu
e2b0386818 remove Color plugin from Flow as a default plugin 2020-12-29 22:32:14 +11:00
弘韬 张
c485578cff Use CompareTo to check update for InstallOrUpdate method 2020-12-29 18:48:55 +08:00
弘韬 张
d0743f6276 Await Http.Download in Update method 2020-12-29 18:48:00 +08:00
弘韬 张
d4f94c66ac Make InstallOrUpdate to async 2020-12-29 18:33:53 +08:00
弘韬 张
0c97db04d4 1. Change Get method Name to GetAsync 
2. Manually replace "#" with "%23" to solve the similar issue in Explorer plugin
3. Add GetAsync method with Uri as argument
4. Remove unused encoding argument
5. Change exception type for WebSearch Plguin
6. Update Comment
 2020-12-29 17:50:56 +08:00
弘韬 张
7dc66eaa9a Merge dev 2020-12-29 17:12:14 +08:00
Jeremy Wu
000bafd116 use camelCase and make last update time variable private 2020-12-29 18:56:51 +11:00
Jeremy Wu
b106688513 version bump 2020-12-29 18:14:33 +11:00
Jeremy Wu
a1d1c95eeb change to tab in browser 2020-12-29 18:14:22 +11:00
Jeremy Wu
0a47636bc9 remove obsolete settings property in context menu class 2020-12-29 18:13:52 +11:00
Jeremy Wu
e5b67ea10a remove obsolete icoPath from settings 2020-12-29 18:04:23 +11:00
Jeremy Wu
f9349a64e9 fix condition of version compare 2020-12-29 17:49:37 +11:00
Jeremy Wu
a1a45a4989 add eof 2020-12-29 17:49:11 +11:00
弘韬 张
c94a2f4c95 Use string.CompareTo instead of equal to check for update 2020-12-29 13:06:08 +08:00
弘韬 张
5da8259228 fix an unintended text error 
add async await to download manifest task
remove unused encoding name for new GetStreamAsync in Http
fix unintened text error
 2020-12-29 13:03:38 +08:00
弘韬 张
f0267475f5 Change call method for default hotkeys. 
Remove extra whitespace
add await using for stream
 2020-12-29 12:23:15 +08:00
弘韬 张
f32e202746 Use System.Text.JsonSerializer.DeserializeAsync instead of Newtonsoft.Json since our plugins.json can be large, so no need to create an extra string to store it. 2020-12-29 12:20:13 +08:00
弘韬 张
bb9682f791 Move get default hotkeys to pluginmanger and make Main.Context non-static 2020-12-29 12:14:59 +08:00
弘韬 张
00457ddc29 change totalSeconds to Hours 2020-12-29 12:08:41 +08:00
弘韬 张
5a0358718c Update PluginManifest if last update time is 12 hours ago 2020-12-28 23:23:25 +08:00
弘韬 张
deaac1c7e4 replace install from search keyword 2020-12-27 22:33:12 +08:00
张弘韬
34f51927cf 1. Move PluginsManager constuction to Init(). 
2. Return HotKeys list when query is like "pm *"
 2020-12-27 21:13:25 +08:00
张弘韬
96609f797e Change the place of Wait in PluginManifest to make code more elegent 2020-12-21 19:42:50 +08:00
弘韬 张
f693f1c6af use Array.empty instead of new [0] to avoid unused allocation 2020-12-20 17:25:14 +08:00
Jeremy Wu
5ab021f444 update per comment 2020-12-20 20:08:52 +11:00
Jeremy Wu
a6bd480534 Merge remote-tracking branch 'origin/dev' into pluginsmanager_update 2020-12-20 19:55:19 +11:00
弘韬 张
d3e88c478a Add Programs Hasher and use IEnumerable instead of ParallelQuery since it performs better. 2020-12-19 14:09:16 +08:00
Jeremy Wu
c2ca29dcda add go to update section if update exists when install 2020-12-17 21:37:38 +11:00
Jeremy Wu
cca53c2a7d add hide main window override 2020-12-17 21:07:47 +11:00
Jeremy Wu
ceab9b2ecd PluginsManager version bump 2020-12-17 20:37:24 +11:00
Jeremy Wu
7e8c49502e add plugin update call 2020-12-17 20:37:01 +11:00
Jeremy Wu
df454778ec update plugin containing folder name from id to version 2020-12-17 19:00:27 +11:00
Jeremy Wu
f12ea653d2 move autocomplete to method 2020-12-17 18:54:30 +11:00
Jeremy Wu
5bc9ce8198 Merge branch 'dev' into fix_loading_uwp 2020-12-17 06:52:37 +11:00