diff --git a/DFAssist.sln b/DFAssist.sln
index 144964e..da5056e 100644
--- a/DFAssist.sln
+++ b/DFAssist.sln
@@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
VisualStudioVersion = 15.0.27130.2026
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DFAssist", "DFAssist\DFAssist.csproj", "{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}"
- ProjectSection(ProjectDependencies) = postProject
- {8563E6B5-78D6-4097-AF58-C3B08713B922} = {8563E6B5-78D6-4097-AF58-C3B08713B922}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectAssist", "InjectAssist\InjectAssist.vcxproj", "{8563E6B5-78D6-4097-AF58-C3B08713B922}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -32,16 +27,6 @@ Global
{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}.Release|x64.Build.0 = Release|x64
{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}.Release|x86.ActiveCfg = Release|Any CPU
{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}.Release|x86.Build.0 = Release|Any CPU
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|Any CPU.ActiveCfg = Debug|Win32
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x64.ActiveCfg = Debug|x64
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x64.Build.0 = Debug|x64
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x86.ActiveCfg = Debug|Win32
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x86.Build.0 = Debug|Win32
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|Any CPU.ActiveCfg = Release|Win32
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x64.ActiveCfg = Release|x64
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x64.Build.0 = Release|x64
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x86.ActiveCfg = Release|Win32
- {8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/DFAssist/MainControl.cs b/DFAssist/MainControl.cs
index f1d869f..6a85f44 100644
--- a/DFAssist/MainControl.cs
+++ b/DFAssist/MainControl.cs
@@ -12,7 +12,6 @@
using System.IO;
using System.Linq;
using System.Text;
-using System.Threading;
using System.Windows.Forms;
using System.Xml;
using Windows.UI.Notifications;
@@ -242,9 +241,7 @@ private void OnInit()
_timer.Enabled = true;
// show a test toast
- //ToastWindowNotification(Localization.GetText("ui-toast-notification-test-title"), Localization.GetText("ui-toast-notification-test-message"));
- var result = DllInjector.GetInstance.Inject("Advanced Combat Tracker", "InjectAssist.dll");
- ToastWindowNotification(result.ToString(), "RESULT: " + result);
+ ToastWindowNotification(Localization.GetText("ui-toast-notification-test-title"), Localization.GetText("ui-toast-notification-test-message"));
_pluginInitializing = false;
}
diff --git a/InjectAssist/InjectAssist.cpp b/InjectAssist/InjectAssist.cpp
deleted file mode 100644
index 39410e6..0000000
--- a/InjectAssist/InjectAssist.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// InjectAssist.cpp : Defines the exported functions for the DLL application.
-//
-
-#include "stdafx.h"
-
-
diff --git a/InjectAssist/InjectAssist.vcxproj b/InjectAssist/InjectAssist.vcxproj
deleted file mode 100644
index 74a30d1..0000000
--- a/InjectAssist/InjectAssist.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
- Debug
- Win32
-
-
- Release
- Win32
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
-
- 15.0
- {8563E6B5-78D6-4097-AF58-C3B08713B922}
- Win32Proj
- InjectAssist
- 10.0.17763.0
-
-
-
- DynamicLibrary
- true
- v141
- Unicode
-
-
- DynamicLibrary
- false
- v141
- true
- Unicode
-
-
- DynamicLibrary
- true
- v141
- Unicode
-
-
- DynamicLibrary
- false
- v141
- true
- Unicode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
- true
- $(SolutionDir)$(Configuration)\
-
-
- false
-
-
- false
- $(SolutionDir)$(Configuration)\
-
-
-
- Use
- Level3
- Disabled
- true
- WIN32;_DEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- MachineX64
-
-
-
-
- Use
- Level3
- Disabled
- true
- _DEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
-
-
-
-
- Use
- Level3
- MaxSpeed
- true
- true
- true
- WIN32;NDEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- true
-
-
-
-
- Use
- Level3
- MaxSpeed
- true
- true
- true
- NDEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
- true
-
-
- Windows
- true
- true
- true
-
-
-
-
-
-
-
-
-
-
- Create
- Create
- Create
- Create
-
-
-
-
-
-
\ No newline at end of file
diff --git a/InjectAssist/InjectAssist.vcxproj.filters b/InjectAssist/InjectAssist.vcxproj.filters
deleted file mode 100644
index 17998df..0000000
--- a/InjectAssist/InjectAssist.vcxproj.filters
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
- cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
-
-
- {93995380-89BD-4b04-88EB-625FBE52EBFB}
- h;hh;hpp;hxx;hm;inl;inc;ipp;xsd
-
-
- {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
- rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
-
-
-
-
- Header Files
-
-
- Header Files
-
-
-
-
- Source Files
-
-
- Source Files
-
-
- Source Files
-
-
-
\ No newline at end of file
diff --git a/InjectAssist/dllmain.cpp b/InjectAssist/dllmain.cpp
deleted file mode 100644
index 86f7822..0000000
--- a/InjectAssist/dllmain.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// dllmain.cpp : Defines the entry point for the DLL application.
-#include "stdafx.h"
-
-DWORD AttachFunction(HMODULE hModule);
-DWORD DetachFunction();
-
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD fdwReason, LPVOID lpReserved)
-{
- hModule;
- lpReserved;
-
- switch (fdwReason)
- {
- case DLL_PROCESS_ATTACH:
- DisableThreadLibraryCalls( hModule );
- CreateThread( NULL, NULL, ( LPTHREAD_START_ROUTINE )AttachFunction, hModule, NULL, NULL );
- break;
- case DLL_PROCESS_DETACH:
- DetachFunction();
- break;
- case DLL_THREAD_DETACH:
- case DLL_THREAD_ATTACH:
- break;
- }
-
- return TRUE;
-}
-
-DWORD AttachFunction( HMODULE hModule )
-{
- MessageBox(0, TEXT("Attach"), TEXT("Attached to dll"), MB_OK);
- FreeLibraryAndExitThread(hModule, NULL);
- return 1;
-}
-
-DWORD DetachFunction()
-{
- MessageBox(0, TEXT("Detach"), TEXT("Detached from dll"), MB_OK);
- return 1;
-}
\ No newline at end of file
diff --git a/InjectAssist/stdafx.cpp b/InjectAssist/stdafx.cpp
deleted file mode 100644
index fd4f341..0000000
--- a/InjectAssist/stdafx.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "stdafx.h"
diff --git a/InjectAssist/stdafx.h b/InjectAssist/stdafx.h
deleted file mode 100644
index f380517..0000000
--- a/InjectAssist/stdafx.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#include "targetver.h"
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-// Windows Header Files
-#include
-
-
-
-// reference additional headers your program requires here
diff --git a/InjectAssist/targetver.h b/InjectAssist/targetver.h
deleted file mode 100644
index 87c0086..0000000
--- a/InjectAssist/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include
diff --git a/data/en-us.json b/data/en-us.json
index d1c2f68..e5f8663 100644
--- a/data/en-us.json
+++ b/data/en-us.json
@@ -1,6 +1,6 @@
{
// Version
- "version": "20190113.1",
+ "version": "20190205.1",
// Duty
"instances": {
diff --git a/data/fr-fr.json b/data/fr-fr.json
index e8aaf2f..ff78b9a 100644
--- a/data/fr-fr.json
+++ b/data/fr-fr.json
@@ -1,6 +1,6 @@
{
// Version
- "version": "20190113.1",
+ "version": "20190205.1",
// Duty
"instances": {
diff --git a/data/ja-jp.json b/data/ja-jp.json
index 32e7abd..4d2aa5b 100644
--- a/data/ja-jp.json
+++ b/data/ja-jp.json
@@ -1,6 +1,6 @@
{
// Version
- "version": "20190113.1",
+ "version": "20190205.1",
// Duty
"instances": {
diff --git a/data/ko-kr.json b/data/ko-kr.json
index 422801c..e2f23e8 100644
--- a/data/ko-kr.json
+++ b/data/ko-kr.json
@@ -1,6 +1,6 @@
{
// 버전
- "version": "20190202.1",
+ "version": "20190206.1",
// 임무
"instances": {
@@ -1272,7 +1272,7 @@
// 4.4 광란의 전주곡
// 4.4 던전
"585": {
- "name": "더 번",
+ "name": "영구 초토지대",
"tank": "1",
"healer": "1",
"dps": "2"
@@ -2028,7 +2028,7 @@
"dps": "0"
},
"598": {
- "name": "금단의 땅 에우레카 : 파이로스",
+ "name": "금단의 땅 에우레카 : 피로스",
"tank": "0",
"healer": "0",
"dps": "0"