Merge branch 'development'

TomGrobbe · Dec 16, 2019 · ef06f35 · ef06f35
2 parents 9e4a396 + a3252ef
commit ef06f35
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 283 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 pull_requests:
   do_not_increment_build_number: false
-image: Visual Studio 2017
+image: Visual Studio 2019
 configuration: Release
 before_build:
   - nuget restore
@@ -10,13 +10,12 @@ build:
   include_nuget_references: true
   verbosity: minimal
 after_build:
-  - cmd: copy README.md ..\build\README.md
-  - cmd: copy LICENSE.md ..\build\LICENSE.md
-  - ps: Invoke-WebRequest -OutFile '..\build\__resource.lua' https://vespura.com/vmenu/__resource.lua
-  - cmd: if %APPVEYOR_REPO_TAG%==true (appveyor SetVariable -Name VERSION_NAME -Value %APPVEYOR_REPO_TAG_NAME%) else (appveyor SetVariable -Name VERSION_NAME -Value beta)
-  - cmd: 7z a vMenu-%VERSION_NAME%.zip -r ..\build\*
+  - cmd: copy README.md ..\build\net452\README.md
+  - cmd: copy LICENSE.md ..\build\net452\LICENSE.md
+  - ps: Invoke-WebRequest -OutFile '..\build\net452\__resource.lua' https://vespura.com/vmenu/__resource.lua
+  - cmd: if %APPVEYOR_REPO_TAG%==true (appveyor SetVariable -Name VERSION_NAME -Value %APPVEYOR_REPO_TAG_NAME%) else (appveyor SetVariable -Name VERSION_NAME -Value beta-%APPVEYOR_BUILD_VERSION%)
+  - cmd: cd ..\build\net452\ && 7z a "..\..\vMenu\vMenu-%VERSION_NAME%.zip" -r * && cd ..\..\vMenu\
   - cmd: appveyor PushArtifact vMenu-%VERSION_NAME%.zip
-  - cmd: if %APPVEYOR_REPO_TAG%==true (curl -F "content=New version :tada:! <@&540562517806809109>" -F "file=@vMenu-"%VERSION_NAME%".zip" %DISCORD_FILE_WEBHOOK%)
 deploy:
   - provider: GitHub
     release: "[Release] vMenu $(VERSION_NAME)"
@@ -29,12 +28,9 @@ deploy:
       APPVEYOR_REPO_TAG: true
     description: "vMenu version $(VERSION_NAME)."
 after_deploy:
-  - ps: if($env:APPVEYOR_REPO_TAG -eq $True) {Invoke-RestMethod https://raw.githubusercontent.com/TomGrobbe/appveyor-discord-webhook/master/send.ps1 -o send.ps1; ./send.ps1 deploy $env:WEBHOOK_URL; rm send.ps1;}
+  - cmd: curl -F "file=@vMenu-%VERSION_NAME%.zip" %DISCORD_FILE_WEBHOOK%
+  - cmd: curl -H "Content-Type:application/json" -X POST -d "{\"content\":\"^<^@^&540562517806809109^>\",\"embeds\":[{\"title\":\"%APPVEYOR_PROJECT_NAME% (%VERSION_NAME%)\",\"description\":\"New version of **%APPVEYOR_PROJECT_NAME%** (%VERSION_NAME%) is available! Download it by using the files in this chanel or by going to the GitHub Tag link!\",\"color\":3048181,\"author\":{\"name\":\"Release build triggered by %APPVEYOR_ACCOUNT_NAME%\",\"url\":\"https://github.com/%APPVEYOR_ACCOUNT_NAME%/\"},\"fields\":[{\"name\":\"AppVeyor Build\",\"value\":\"[Here](%APPVEYOR_URL%/project/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%/builds/%APPVEYOR_BUILD_ID%)\"},{\"name\":\"GitHub Commit (%APPVEYOR_REPO_COMMIT%)\",\"value\":\"[%APPVEYOR_REPO_COMMIT%](https://github.com/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_NAME%/commit/%APPVEYOR_REPO_COMMIT%) - %APPVEYOR_REPO_COMMIT_MESSAGE%%APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED%\"},{\"name\":\"GitHub Branch\",\"value\":\"[%APPVEYOR_REPO_BRANCH%](https://github.com/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_NAME%/tree/%APPVEYOR_REPO_BRANCH%)\"},{\"name\":\"GitHub Tag\",\"value\":\"[%APPVEYOR_REPO_TAG_NAME%](https://github.com/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_NAME%/releases/tag/%APPVEYOR_REPO_TAG_NAME%)\"}]}]}" %WEBHOOK_URL%
 on_success:
-  - ps: Invoke-RestMethod https://raw.githubusercontent.com/TomGrobbe/appveyor-discord-webhook/master/send.ps1 -o send.ps1
-  - ps: ./send.ps1 success $env:WEBHOOK_URL
-  - ps: rm send.ps1
+  - cmd: if %APPVEYOR_REPO_TAG%==false curl -H "Content-Type:application/json" -X POST -d "{\"embeds\":[{\"title\":\"%APPVEYOR_PROJECT_NAME% (%VERSION_NAME%)\",\"description\":\"Build passed!\",\"color\":4502298,\"author\":{\"name\":\"Build triggered by %APPVEYOR_ACCOUNT_NAME%\",\"url\":\"https://github.com/%APPVEYOR_ACCOUNT_NAME%/\"},\"fields\":[{\"name\":\"AppVeyor Build\",\"value\":\"[Here](%APPVEYOR_URL%/project/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%/builds/%APPVEYOR_BUILD_ID%)\"},{\"name\":\"GitHub Commit (%APPVEYOR_REPO_COMMIT%)\",\"value\":\"[%APPVEYOR_REPO_COMMIT%](https://github.com/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_NAME%/commit/%APPVEYOR_REPO_COMMIT%) - %APPVEYOR_REPO_COMMIT_MESSAGE%%APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED%\"},{\"name\":\"GitHub Branch\",\"value\":\"[%APPVEYOR_REPO_BRANCH%](https://github.com/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_NAME%/tree/%APPVEYOR_REPO_BRANCH%)\"}]}]}" %WEBHOOK_URL%
 on_failure:
-  - ps: Invoke-RestMethod https://raw.githubusercontent.com/TomGrobbe/appveyor-discord-webhook/master/send.ps1 -o send.ps1
-  - ps: ./send.ps1 failure $env:WEBHOOK_URL
-  - ps: rm send.ps1
+  - cmd: curl -H "Content-Type:application/json" -X POST -d "{\"embeds\":[{\"title\":\"%APPVEYOR_PROJECT_NAME% (%VERSION_NAME%)\",\"description\":\"Build FAILED! Ouch.\",\"color\":13632027,\"author\":{\"name\":\"Build triggered by %APPVEYOR_ACCOUNT_NAME%\",\"url\":\"https://github.com/%APPVEYOR_ACCOUNT_NAME%/\"},\"fields\":[{\"name\":\"AppVeyor Build\",\"value\":\"[Here](%APPVEYOR_URL%/project/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%/builds/%APPVEYOR_BUILD_ID%)\"},{\"name\":\"GitHub Commit (%APPVEYOR_REPO_COMMIT%)\",\"value\":\"[%APPVEYOR_REPO_COMMIT%](https://github.com/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_NAME%/commit/%APPVEYOR_REPO_COMMIT%) - %APPVEYOR_REPO_COMMIT_MESSAGE%%APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED%\"},{\"name\":\"GitHub Branch\",\"value\":\"[%APPVEYOR_REPO_BRANCH%](https://github.com/%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_NAME%/tree/%APPVEYOR_REPO_BRANCH%)\"}]}]}" %WEBHOOK_URL%
diff --git a/dependencies/client/MenuAPI.dll b/dependencies/client/MenuAPI.dll
diff --git a/vMenu/Properties/AssemblyInfo.cs b/vMenu/Properties/AssemblyInfo.cs
diff --git a/vMenu/Properties/Resources.Designer.cs b/vMenu/Properties/Resources.Designer.cs
diff --git a/vMenu/data/VehicleData.cs b/vMenu/data/VehicleData.cs
@@ -342,6 +342,7 @@ public static class Vehicles
                 "LANDSTALKER",
                 "MESA",
                 "MESA2",
+                "NOVAK", // Casino DLC
                 "PATRIOT",
                 "PATRIOT2", // dlc (mpbattle)
                 "RADI",
@@ -397,6 +398,8 @@ public static class Vehicles
                 "FACTION3",
                 "GAUNTLET",
                 "GAUNTLET2",
+                "GAUNTLET3", // Casino DLC
+                "GAUNTLET4", // Casino DLC
                 "HERMES",
                 "HOTKNIFE",
                 "HUSTLER",
@@ -411,6 +414,7 @@ public static class Vehicles
                 "MOONBEAM",
                 "MOONBEAM2",
                 "NIGHTSHADE",
+                "PEYOTE2", // Casino DLC
                 "PHOENIX",
                 "PICADOR",
                 "RATLOADER",
@@ -453,6 +457,7 @@ public static class Vehicles
                 "CHEETAH2",
                 "COQUETTE2",
                 "DELUXO",
+                "DYNASTY", // Casino DLC
                 "FAGALOA",
                 "FELTZER3", // Stirling GT
                 "GT500",
@@ -463,6 +468,7 @@ public static class Vehicles
                 "MANANA",
                 "MICHELLI",
                 "MONROE",
+                "NEBULA", // Casino DLC
                 "PEYOTE",
                 "PIGALLE",
                 "RAPIDGT3",
@@ -482,6 +488,7 @@ public static class Vehicles
                 "TURISMO2",
                 "VISERIS",
                 "Z190",
+                "ZION3", // Casino DLC
                 "ZTYPE",
             };
             #endregion
@@ -502,6 +509,7 @@ public static class Vehicles
                 "COMET4",
                 "COMET5",
                 "COQUETTE",
+                "DRAFTER", // Casino DLC
                 "ELEGY",
                 "ELEGY2",
                 "FELTZER2",
@@ -511,19 +519,25 @@ public static class Vehicles
                 "FUTO",
                 "GB200",
                 "HOTRING",
+                "ISSI7", // Casino DLC
                 "ITALIGTO", // MPCHRISTMAS2018 DLC
                 "JESTER",
                 "JESTER2",
+                "JUGULAR", // Casino DLC
                 "KHAMELION",
                 "KURUMA",
                 "KURUMA2",
+                "LOCUST", // Casino DLC
                 "LYNX",
                 "MASSACRO",
                 "MASSACRO2",
+                "NEO", // Casino DLC
                 "NEON", // Doomsday Heist Update
                 "NINEF",
                 "NINEF2",
                 "OMNIS",
+                "PARAGON", // Casino DLC
+                "PARAGON2", // Casino DLC
                 "PARIAH",
                 "PENUMBRA",
                 "RAIDEN",
@@ -562,13 +576,15 @@ public static class Vehicles
                 "CHEETAH",
                 "CYCLONE",
                 "DEVESTE", // MPCHRISTMAS2018 DLC
+                "EMERUS", // Casino DLC
                 "ENTITYXF",
                 "ENTITY2",
                 "FMJ",
                 "GP1",
                 "INFERNUS",
                 "ITALIGTB",
                 "ITALIGTB2",
+                "KRIEGER", // Casino DLC
                 "LE7B",
                 "NERO",
                 "NERO2",
@@ -577,6 +593,7 @@ public static class Vehicles
                 "PFISTER811",
                 "PROTOTIPO",
                 "REAPER",
+                "S80", // Casino DLC
                 "SC1",
                 "SCRAMJET", // dlc (mpbattle)
                 "SHEAVA", // ETR1
@@ -585,6 +602,7 @@ public static class Vehicles
                 "TAIPAN",
                 "TEMPESTA",
                 "TEZERACT",
+                "THRAX", // Casino DLC
                 "TURISMOR",
                 "TYRANT",
                 "TYRUS",
@@ -596,6 +614,7 @@ public static class Vehicles
                 "VOLTIC2",
                 "XA21",
                 "ZENTORNO",
+                "ZORRUSSO", // Casino DLC
             };
             #endregion
             #region Motorcycles
@@ -639,6 +658,7 @@ public static class Vehicles
                 "OPPRESSOR2", // dlc (mpbattle)
                 "PCJ",
                 "RATBIKE",
+                "RROCKET", // Casino DLC
                 "RUFFIAN",
                 "SANCHEZ",
                 "SANCHEZ2",
@@ -673,6 +693,7 @@ public static class Vehicles
                 "BRUTUS2", // MPCHRISTMAS2018 DLC
                 "BRUTUS3", // MPCHRISTMAS2018 DLC
                 "CARACARA",
+                "CARACARA2", // Casino DLC
                 "DLOADER",
                 "DUBSTA3",
                 "DUNE",
@@ -681,6 +702,7 @@ public static class Vehicles
                 "DUNE4",
                 "DUNE5",
                 "FREECRAWLER", // dlc (mpbattle)
+                "HELLION", // Casino DLC
                 "INSURGENT",
                 "INSURGENT2",
                 "INSURGENT3",