Resolve merge conflicts

Author: juliarn

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,52 @@
+---
+name: 🐞 Bug report
+about: Create an issue which describes a bug of CloudNet
+
+---
+
+**Describe the bug**<br>
+<!-- A clear and concise description of what the bug is. Summarize the bug with a few words. -->
+
+
+**Steps for reproducing**<br>
+<!-- Here is a example how this could look like. The important thing is that you are describing the steps as specific as possible! -->
+<!--
+```
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+```
+```
+Steps to reproduce the exception:
+1. Declare object '....'
+2. Call method '#foo(int)'
+3. See exception
+```
+-->
+
+
+**Expected behavior**<br>
+<!-- A clear and concise description of what you expected to happen. -->
+
+
+**Screenshots**<br>
+<!-- If applicable, add screenshots to help explaining your problem. -->
+
+
+**Please provide us information about your environment and used assets**
+<!-- Example: 
+ - System specs: Technical information about your hardware [e.g. CPU = Intel i5 7th Gen etc.]
+ - OS: On which operating system did the bug occurr? [e.g. Linux, OS X, Windows]
+ - Version: Which release and build version did you run/use? [e.g. CloudNet 3.x]
+ 
+ ------ Copy-paste ------ 
+ System specs:
+ OS:
+ Version:
+-->
+
+
+**Additional context**<br>
+<!-- Add any other context about the problem here. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,16 @@
+---
+name: 💡 Feature request
+about: Create an issue describing a feature you want to see in CloudNet
+
+---
+
+**Please describe the proposed feature**<br>
+<!--
+A clear and concise description why you would like to see that
+feature in CloudNet. Is it related to a problem? If so please give
+use some context what the problem is. 
+-->
+
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+<!-- PLEASE ENSURE YOU HAVE READ CLOUDNET'S CODESTYLE GUIDELINES -->
+<!-- IF YOU'RE NOT FOLLOWING CLOUDNET'S CODESTYLE GUIDELINES, THEN THIS PULL REQUEST IS LIKELY TO BE REJECTED -->
+<!-- IF YOU'RE NOT PROVIDING ANY INFORMATION, THEN THIS PULL REQUEST IS LIKELY TO BE REJECTED -->
+
+- [ ] breaking changes
+- [ ] no breaking changes
+
+### changes made to the repository
+<!-- a brief description of the changes done in this pull request -->
+
+
+### related issues/discussions
+<!-- put here any issues or discussions related to this pull request -->  

build.gradle

@@ -209,4 +209,4 @@ task allJavadoc(type: Javadoc) {
     source = exportedProjects.collect { project(it).sourceSets.main.allJava }
     classpath = files(exportedProjects.collect { project(it).sourceSets.main.compileClasspath })
     failOnError = false
-}
+}