From bea2e1201e6580e69e0a60dc10d9a3840d66396c Mon Sep 17 00:00:00 2001 From: dodison Date: Sun, 18 Jul 2021 16:01:07 +0200 Subject: [PATCH] Added Visual Studio Code files to .gitignore --- patches/api/0001-Convert-project-to-Gradle.patch | 10 +++++++++- patches/server/0001-Setup-Gradle-project.patch | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 5b8589e7523c..0cbc85fb7e34 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -8,7 +8,7 @@ apply if there are changes made to it from upstream - thus notifying us that changes were made. diff --git a/.gitignore b/.gitignore -index e431e3435737e28394d81b56568a08b3c3148b9b..c484aff2c192bf42059b5689327909e4af654401 100644 +index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f2177b6a036 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ @@ -17,6 +17,14 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..c484aff2c192bf42059b5689327909e4 # Eclipse stuff /.classpath /.project +@@ -30,3 +32,7 @@ + *.ipr + *.iws + .idea/ ++ ++# vs code ++/.vscode ++/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..6e64a444fb20aabaabfb15a30d645702c11c2da8 diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 5e43374e907d..f3265983042a 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -8,7 +8,7 @@ apply if there are changes made to it from upstream - thus notifying us that changes were made. diff --git a/.gitignore b/.gitignore -index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a2f617b57 100644 +index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f8c589937 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ @@ -18,6 +18,14 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a # Eclipse stuff /.classpath /.project +@@ -37,3 +40,7 @@ dependency-reduced-pom.xml + + /src/main/resources/achievement + /src/main/resources/lang ++ ++# vs code ++/.vscode ++/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000000000000000000000000000000000000..8d27de2c9da08ca32ff18fc4b8b02ea583edfc1c