diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..1ff0c423 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index 2700eac3..b7bdf2b8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,11 @@ speed-measure-plugin*.json !.vscode/extensions.json .history/* +# IDE - VS +*.vs/ +**/obj/ +**/bin/ + # release /release diff --git a/CHANGELOG.md b/CHANGELOG.md index e8c150c2..79fdd995 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## 1.0.7 (2020-07-01) + +- added the version number at the evaluate, inspect and settings window +- update trade action still interested to be always shown for incoming requests +- update the market history to only show unique requests +- fixed an focus issue occurring when using the trade whisper button +- fixed an issue accessing the clipboard +- fixed an issue querying the map tier + ## 1.0.6 (2020-06-25) - added a history for the market search diff --git a/manifest.json b/manifest.json index 43955456..0f7f6164 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "meta": { "name": "PoE Overlay", "author": "Kyusung4698", - "version": "1.0.6", + "version": "1.0.7", "minimum-overwolf-version": "0.147.0", "description": "Search the market and send trade offers. Get current market values for your item. View insights for maps and items.", "dock_button_title": "PoE Overlay", @@ -146,6 +146,7 @@ "disable_rightclick": true, "transparent": true, "resizable": true, + "ignore_keyboard_events": true, "size": { "width": 310, "height": 400 @@ -159,6 +160,7 @@ "disable_rightclick": true, "transparent": true, "resizable": true, + "ignore_keyboard_events": true, "size": { "width": 1212, "height": 699 @@ -290,6 +292,12 @@ "enable_auto_refresh": true, "reload_delay": 1000, "filter": "dist/*.*" + }, + "extra-objects": { + "clipboard-plugin": { + "file": "plugins/dist/clipboard.dll", + "class": "overwolf.plugins.clipboard" + } } } } \ No newline at end of file diff --git a/overlay.babel b/overlay.babel index 49db2c0a..8cbe763b 100644 --- a/overlay.babel +++ b/overlay.babel @@ -1,4 +1,4 @@ - +