diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 9e5aab0..06848b9 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,7 +1,8 @@ { "ExpandedNodes": [ - "" + "", + "\\src" ], - "SelectedNode": "\\COPYING", + "SelectedNode": "\\src\\main.cpp", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/enviromint/v15/.suo b/.vs/enviromint/v15/.suo index d47d4bc..568d044 100644 Binary files a/.vs/enviromint/v15/.suo and b/.vs/enviromint/v15/.suo differ diff --git a/.vs/enviromint/v15/Browse.VC.db b/.vs/enviromint/v15/Browse.VC.db index 3b13a6a..ec5b3f3 100644 Binary files a/.vs/enviromint/v15/Browse.VC.db and b/.vs/enviromint/v15/Browse.VC.db differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index e6b5cc7..150382c 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Enviromint-qt.pro.user b/Enviromint-qt.pro.user new file mode 100644 index 0000000..75fbd8e --- /dev/null +++ b/Enviromint-qt.pro.user @@ -0,0 +1,261 @@ + + + + + + EnvironmentId + {d32dd623-aa09-4391-a8b0-ce3aded51be0} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + System + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {3df3c7cb-2c5c-4651-89fa-1e245de47fea} + 0 + 0 + 0 + + C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop + + + true + qmake + qmake + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + Make + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + Make + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + false + + + C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop + + + true + qmake + qmake + QtProjectManager.QMakeBuildStep + false + + false + false + false + + + true + Make + Make + Qt4ProjectManager.MakeStep + + false + + + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Make + Make + Qt4ProjectManager.MakeStep + + true + clean + + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + No deployment + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + + %{buildDir} + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/Enviromint-qt.pro.user.2.1pre1 b/Enviromint-qt.pro.user.2.1pre1 new file mode 100644 index 0000000..bda1a44 --- /dev/null +++ b/Enviromint-qt.pro.user.2.1pre1 @@ -0,0 +1,113 @@ + + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + System + + + + ProjectExplorer.Project.Target.0 + + Desktop + Qt4ProjectManager.Target.DesktopTarget + 0 + 0 + + + qmake + QtProjectManager.QMakeBuildStep + + + + Make + Qt4ProjectManager.MakeStep + false + + + + 2 + + Make + Qt4ProjectManager.MakeStep + true + + clean + + + + 1 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop + 2 + 202 + false + + + + qmake + QtProjectManager.QMakeBuildStep + + + + Make + Qt4ProjectManager.MakeStep + false + + + + 2 + + Make + Qt4ProjectManager.MakeStep + true + + clean + + + + 1 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + C:/Users/nathan.slaven/Documents/GitHub/Enviromint-qt-build-desktop + 2 + 202 + true + + 2 + + Enviromint-qt + Qt4ProjectManager.Qt4RunConfiguration + 2 + + Enviromint-qt.pro + false + false + + false + false + + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 4 + + diff --git a/src/main.cpp b/src/main.cpp index 586867d..e8a9980 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2532,9 +2532,9 @@ bool LoadBlockIndex(bool fAllowNew) // CTxOut(empty) // vMerkleTree: 12630d16a9 - const char* pszTimestamp = "ny times brussels 032416"; + const char* pszTimestamp = "Eminem’s Daughter Is 22, And We’re All Frickin’ Old, BuzzFeed 123117"; CTransaction txNew; - txNew.nTime = 1458855606; + txNew.nTime = 1514764801; txNew.vin.resize(1); txNew.vout.resize(1); txNew.vin[0].scriptSig = CScript() << 0 << CBigNum(42) << vector((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp)); @@ -2544,7 +2544,7 @@ bool LoadBlockIndex(bool fAllowNew) block.hashPrevBlock = 0; block.hashMerkleRoot = block.BuildMerkleTree(); block.nVersion = 1; - block.nTime = 1458855606; + block.nTime = 1514764801; block.nBits = bnProofOfWorkLimit.GetCompact(); block.nNonce = !fTestNet ? 166149 : 0;