Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.8.2
+- Fix for mining conceal or other coins with cn-msr
+- Fixed avg.time on Dashboard
+# 1.8.1
+- Fix connection stuck in Failover case when DNS resolve fails #197
+- Fix supported-variants announcement in login 
 # 1.8.0
 - Integration of cnv2 aka moneroV8
 - Hashrate improve -> all cnv1, cn-litev1, cnv2, xtl by adding ASM code for Intel/AMD and softaes [thx @SChernykh]

README.md

@@ -1,6 +1,6 @@
 # XMRigCC 
 
-:warning: **Monero is forking to cnv2 on block 1685555 (2018-10-18) make sure you upgrade to at least XMRigCC 1.8.0**
+:warning: **Monero forked to cnv2 on block 1685555 (2018-10-18) make sure you upgrade to at least XMRigCC 1.8.0 to mine XMR**
 
 :bulb: **This is the CPU variant of XMRigCC, if you're looking for the AMD GPU (OpenCL) variant [click here](https://github.com/Bendr0id/xmrigCC-amd/).**
 

index.html

@@ -279,8 +279,8 @@
                     .column(10, {page: 'current'})
                     .data()
                     .reduce(function (a, b) {
-                        return (a + b) / 2;
-                    }, 0);
+                        return (a + b);
+                    }, 0) / api.column(10, {page: 'current'}).data().length;
 
                 sumSharesGood = api
                     .column(11, {page: 'current'})

src/net/Job.cpp

@@ -146,15 +146,6 @@ PowVariant Job::powVariant() const
         } else {
             return PowVariant::POW_V0;
         }
-    }
-    else if (m_powVariant == PowVariant::POW_XTL && m_blob[0] < 4) {
-        return POW_V1;
-    }
-    else if (m_powVariant == PowVariant::POW_MSR && m_blob[0] < 7) {
-        return POW_V1;
-    }
-    else if (m_powVariant == PowVariant::POW_XHV && m_blob[0] < 3) {
-        return POW_V0;
     } else {
         return m_powVariant;
     }

src/version.h

@@ -36,14 +36,14 @@
 #define APP_DESC      "XMRigCC CPU miner"
 #define APP_COPYRIGHT "Copyright (C) 2017- BenDr0id"
 #endif
-#define APP_VERSION   "1.8.0 (based on XMRig)"
+#define APP_VERSION   "1.8.2 (based on XMRig)"
 #define APP_DOMAIN    ""
 #define APP_SITE      "https://github.com/Bendr0id/xmrigCC"
 #define APP_KIND      "cpu"
 
 #define APP_VER_MAJOR  1
 #define APP_VER_MINOR  8
-#define APP_VER_BUILD  0
+#define APP_VER_BUILD  2
 #define APP_VER_REV    0
 
 #ifndef NDEBUG