minor fixes, changed notes/version

PoE-TradeMacro · Dec 27, 2016 · dbd77df · dbd77df
1 parent 5f2525b
commit dbd77df
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/PoE-TradeMacro.exe → PoE-TradeMacro_(Fallback).exe b/PoE-TradeMacro.exe → PoE-TradeMacro_(Fallback).exe
diff --git a/TradeUpdates.txt b/TradeUpdates.txt
@@ -1,5 +1,13 @@
 The following is a list of what has been updated, starting with 1.1.0
 
+1.5.0
+================================================================================================
+Improved error handling/feedback (CloudFlare bypass).
+Added option to set cookies manually instead of having them retrieved automatically (settings menu).
+Added button to delete IE cookies (error window).
+Added option to delete IE cookies on script start (default = enabled).
+Fixed some minor issues.
+
 1.4.1
 ================================================================================================
 Added c# script to get user-agent and cookies automatically.

diff --git a/_compileRelease.ahk b/_compileRelease.ahk
@@ -6,5 +6,5 @@
 }
 
 SplitPath, A_AhkPath,, AhkDir
-RunWait %comspec% /c ""%AhkDir%"\Compiler\Ahk2Exe.exe /in "main.ahk" /out "PoE-TradeMacro.exe" /icon "trade_data\poe-trade-bl.ico""
+RunWait %comspec% /c ""%AhkDir%"\Compiler\Ahk2Exe.exe /in "main.ahk" /out "PoE-TradeMacro_(Fallback).exe" /icon "trade_data\poe-trade-bl.ico""
 ExitApp
diff --git a/trade_config.ini b/trade_config.ini
@@ -68,7 +68,7 @@ AdvancedSearchModValueRangeMax =20
 ; We then use AdvancedSearchModValueRange as a percentage of this differences to create a range (min/max value) to search. 
 RemoveMultipleListingsFromSameAccount =1
 ; Removes multiple listings from the same account from the search results (combat market manipulators)
-; Default is 0 = off, set to 1 = enabled
+; Default is 1 = on, set to 0 = disabled
 PrefillMinValue =1
 PrefillMaxValue =1
 CurrencySearchHave =Chaos Orb

diff --git a/trade_data/TradeMacroInit.ahk b/trade_data/TradeMacroInit.ahk
@@ -955,7 +955,7 @@ TradeFunc_ReadCookieData() {
 		Try {		
 			If (!FileExist(A_ScriptDir "\temp\getCookieData.exe")) {
 				CompiledExeNotFound := 1			
-				If (DotNetFrameworkInstallation.Major < 4) {
+				If (DotNetFrameworkInstallation.Major < 2) {
 					WrongNetFrameworkVersion := 1
 				}
 			}
@@ -1038,7 +1038,7 @@ TradeFunc_ReadCookieData() {
 			Gui, CookieWindow:Add, Text, cRed, <ScriptDirectory\temp\getCookieData.exe> not found!
 			Gui, CookieWindow:Add, Text, , - It seems compiling and moving the .exe file failed.
 			If (WrongNetFrameworkVersion) {
-				Gui, CookieWindow:Add, Text, , `n- Net Framework 4 is required (for now) but it seems you don't have it.
+				Gui, CookieWindow:Add, Text, , `n- Net Framework 2 is required but it seems you don't have it.
 				Gui, CookieWindow:Add, Link, cBlue, <a href="https://www.microsoft.com/en-us/download/details.aspx?id=17851">Download it here</a> 
 			}
 		}
@@ -1047,7 +1047,7 @@ TradeFunc_ReadCookieData() {
 			Gui, CookieWindow:Add, Text, cRed, Bypassing poe.trades CloudFlare protection failed!
 			Gui, CookieWindow:Add, Text, , - Cookies and user-agent were retrieved.`n- Lowered/disabled Internet Explorer security settings can cause this to fail.
 			cookiesDeleted := (TradeOpts.DeleteCookies and not TradeOpts.UseManualCookies) ? "Cookies were deleted on script start." : ""
-			Gui, CookieWindow:Add, Text, , - %cookiesDeleted% Please try again or test the compiled`n  script <ScriptDirectory\PoE-TradeMacro.exe>.`n- Make sure that you're not using any proxy server.
+			Gui, CookieWindow:Add, Text, , - %cookiesDeleted% Please try again and make sure that `n  you're not using any proxy server.`n- If all else fails try using the compiled script <PoE-TradeMacro_(Fallback).exe>.
 			Gui, CookieWindow:Add, Text, , The connection test sometimes fails while using the correct user-agent/cookies. `nJust try it again to be sure.			
 			Gui, CookieWindow:Add, Text, , You can also try setting the cookies manually in the settings menu (with 'How to' link).
 		}
@@ -1067,7 +1067,8 @@ TradeFunc_ReadCookieData() {
 				}
 			}
 		}
-
+
+		Gui, CookieWindow:Add, Link, cBlue, Take a look at the <a href="https://github.com/PoE-TradeMacro/POE-TradeMacro/wiki/FAQ">FAQ</a>.
 		Gui, CookieWindow:Add, Link, cBlue, Report on <a href="https://github.com/PoE-TradeMacro/POE-TradeMacro/issues/149#issuecomment-268639184">Github</a>, <a href="https://discord.gg/taKZqWw">Discord</a>, <a href="https://www.pathofexile.com/forum/view-thread/1757730/">the forum</a>.
 		Gui, CookieWindow:Add, Text, , Please also provide this information in your report.
 		Gui, CookieWindow:Add, Edit, r5 ReadOnly w430, %CookieFile% `n%Cookies% `n%OSInfo% `n%Compilation% `n%NetFramework% `n%IE%

diff --git a/trade_data/Version.txt b/trade_data/Version.txt
@@ -1,2 +1,2 @@
-TradeReleaseVersion := "1.4.1"
+TradeReleaseVersion := "1.5.0"
 TradeAHKVersionRequired := "1.1.24.01"
diff --git a/trade_data/trade_defaults.ini b/trade_data/trade_defaults.ini
@@ -68,7 +68,7 @@ AdvancedSearchModValueRangeMax =20
 ; We then use AdvancedSearchModValueRange as a percentage of this differences to create a range (min/max value) to search. 
 RemoveMultipleListingsFromSameAccount =1
 ; Removes multiple listings from the same account from the search results (combat market manipulators)
-; Default is 0 = off, set to 1 = enabled
+; Default is 1 = on, set to 0 = disabled
 PrefillMinValue =1
 PrefillMaxValue =1
 CurrencySearchHave =Chaos Orb