From 950be097384b4cdba1361910eb4e4204550b56c7 Mon Sep 17 00:00:00 2001 From: simplyphp Date: Sun, 31 Jul 2016 22:34:54 -0500 Subject: [PATCH 1/3] Updating to proper repo --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index abc05af74..21890a7ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "FeroxRev"] - path = FeroxRev - url = https://github.com/yamashi/Pokemon-Go-Rocket-API +[submodule "Pokemon-Go-Rocket-API"] + path = Pokemon-Go-Rocket-API + url = https://github.com/FeroxRev/Pokemon-Go-Rocket-API \ No newline at end of file From 2207c9cbdb7aca5ce2e3c9f45b0043fa131f9cbe Mon Sep 17 00:00:00 2001 From: simplyphp Date: Mon, 1 Aug 2016 00:04:35 -0500 Subject: [PATCH 2/3] Fixing to use latest FeroxRev API --- .gitmodules | 2 +- FeroxRev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index abc05af74..15477dce3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "FeroxRev"] path = FeroxRev - url = https://github.com/yamashi/Pokemon-Go-Rocket-API + url = https://github.com/NecronomiconCoding/NecroBot-Rocket-API diff --git a/FeroxRev b/FeroxRev index e5ed64e28..31f14b96c 160000 --- a/FeroxRev +++ b/FeroxRev @@ -1 +1 @@ -Subproject commit e5ed64e284bb078a451ee5325645d67789d63809 +Subproject commit 31f14b96ce746f7a10e2a39e38743cc1323c229e From 87515dc0c35fb9cab4f03a94af03e347e03ae060 Mon Sep 17 00:00:00 2001 From: simplyphp Date: Mon, 1 Aug 2016 00:10:49 -0500 Subject: [PATCH 3/3] Fixed final issues with Api --- PoGo.NecroBot.CLI/Program.cs | 3 +-- PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PoGo.NecroBot.CLI/Program.cs b/PoGo.NecroBot.CLI/Program.cs index d8eea72e3..460871781 100644 --- a/PoGo.NecroBot.CLI/Program.cs +++ b/PoGo.NecroBot.CLI/Program.cs @@ -37,7 +37,6 @@ private static void Main(string[] args) Logger.SetLogger(new ConsoleLogger(LogLevel.Info), subPath); var settings = GlobalSettings.Load(subPath); - if (settings == null) { @@ -48,7 +47,7 @@ private static void Main(string[] args) return; } var session = new Session(new ClientSettings(settings), new LogicSettings(settings)); - //session.Client.ApiFailure = new ApiFailureStrategy(session); + session.Client.ApiFailure = new ApiFailureStrategy(session); /*SimpleSession session = new SimpleSession { diff --git a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj index 1ed22077e..6c9347407 100644 --- a/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj +++ b/PoGo.NecroBot.Logic/PoGo.NecroBot.Logic.csproj @@ -56,6 +56,7 @@ +