Merge 1.15

There are a couple benefits to this:
- Light method no longer relies on forge method
- Fluid changes detectable by observer
- Tighter API (only take accepted fluids)

.gitattributes

@@ -0,0 +1,2 @@
+*      text=auto eol=lf
+*.java text      diff=java eol=lf

.github/CONTRIBUTING.md

@@ -0,0 +1,30 @@
+Hey there. Looks like you want to contribute with an issue. Great. Here's what you have to do:
+* Have a look through the [Botania FAQ](https://botaniamod.net/faq.php), to see if your issue has been solved already;
+* Read through the steps on [Bug Reporting 101](https://vazkii.net/br101/) (You may skip this if you're already familiar with reporting issues, but it's good for newcomers);
+* Note the following points:
+  * Issues regarding "Bukkit+Forge" servers that are not reproducible with Forge only are **not accepted**;
+  * Issues regarding outdated versions of the mod, especially for older versions of Minecraft, are **not accepted**;
+  * Unless you manually update every mod on the pack to the latest, issues regarding any public modpack that is not officially maintained or supported by the Botania developers (the ones in the modpack section of the website are not) are **not accepted**;
+  * Duplicate issues or issues that have been solved already (use the search feature!) will be closed without asking.
+  * Do not tag your issues' names. "Something Broke" is prefered to "[Bug] Something Broke"  because there's a proper label system in place.
+  * Suggestions are **not** accepted here. Post them on the forums or reddit instead. If there's any still open they're old ones before this rule was added.
+
+The following "bugs" are not accepted:
+* 1.12 or older version issues
+  * Only the latest version of the mod is supported.
+* Intended Behaviour
+  * Double tall flowers need be harvested with shears to not clutter the inventory
+* Not a Botania problem/Not fixable
+  * Mana Bursts get destroyed on plugin servers by lag-clearing plugins (add botania:mana_burst to the blacklist)
+  * Force Relays destroy blocks when used very fast (Can't fix due to the nature of the block)
+  * Terrasteel crafting won't start (make sure your checkerboard is correct, there's Livingrock under the plate)
+
+[Report the Issue](https://github.com/Vazkii/Botania/issues)!
+
+---
+
+If you want to make a Pull Request keep these in mind:
+* Do NOT use the github editor. Test your damn PRs before you submit them.
+* We are strict when it comes to syntax. Make sure your PR's syntax matches the syntax of the rest of the code. That includes spacing after if/for/(etc), proper bracket usage, camel casing and copyleft headers on new classes.
+  * Run the `checkSyntax` Gradle tasks before submitting your PR to identify bad formatting. You can use the `spotlessJavaApply` task to fix some of those issues, like license headers.
+* If your pull request edits very small chunks of code and isn't flawless we might close it as it'll probably take less time to fix it ourselves rather than pull yours and change the code.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Report an issue with supported versions of Botania
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!--
+# Notice
+Please do not use github issues to post ideas. Ideas should be posted on the Botania Reddit (https://www.reddit.com/r/botania/), or discussed on Discord.
+Please delete everything above the version information, including this notice before submitting your issue.  
+Tip: Use two spaces at the end of lines to force a new line.
+-->
+# Version Information
+Forge version:  
+Botania version:  
+
+# Further Information
+Link to crash log: (please use a paste site such as [gist](https://gist.github.com/), do not attach the .txt or paste the log inline)\
+Steps to reproduce:
+1. First step
+2. Second step
+3. etc...
+
+What I expected to happen:
+
+What happened instead:

.github/workflows/gradle.yml

@@ -0,0 +1,22 @@
+name: Java CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache
+      uses: actions/cache@v1
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }}
+    - name: Build with Gradle
+      run: ./gradlew pmdMain spotlessJavaCheck build --no-daemon

.github/workflows/stale.yml

@@ -0,0 +1,18 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue is stale because it has been open for a while with no activity. Remove stale label or comment or this will be closed soon.'
+        stale-pr-message: 'This PR is stale because it has been open for a while with no activity. Remove stale label or comment or this will be closed soon.'
+        exempt-issue-label: 'confirmed'

.gitignore

@@ -23,6 +23,7 @@ Thumbs.db
 /*.ipr
 /*.iws
 /*.iml
+/classes
 
 ## Private Stuffs
 /private.properties
@@ -30,17 +31,12 @@ Thumbs.db
 ## Jars
 *.jar
 !/gradle/wrapper/gradle-wrapper.jar
-!GardenOfGlass.jar
 
 ### OSX (adds a lot of garbage)###
 .DS_Store
 .AppleDouble
 .LSOverride
 
-# Icon must end with two \r
-Icon
-
-
 # Thumbnails
 ._*
 
@@ -59,3 +55,5 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+# Data Generator cache
+/src/generated/resources/.cache/

Jenkinsfile

@@ -0,0 +1,40 @@
+#!/usr/bin/env groovy
+
+pipeline {
+    agent any
+    stages {
+        stage('Clean') {
+            steps {
+                echo 'Cleaning Project'
+                sh 'chmod +x gradlew'
+                sh './gradlew clean --no-daemon'
+            }
+        }
+        stage('Build and Deploy Release') {
+            when {
+                tag 'release-*'
+            }
+            environment {
+                RELEASE_MODE = '1'
+            }
+            steps {
+                sh './gradlew build publish --no-daemon'
+            }
+        }
+        stage('Build and Deploy Snapshot') {
+            when {
+                not {
+                    tag 'release-*'
+                }
+            }
+            steps {
+                sh './gradlew build publish --no-daemon'
+            }
+        }
+    }
+    post {
+        always {
+            archiveArtifacts 'build/libs/**.jar'
+        }
+    }
+}

README.md

@@ -1,21 +1,8 @@
-README:
-
-This is williewillus' port and continuation of Botania for Minecraft versions 1.8.x and above
-
-All licensing and distribution rights are exactly as 1.7.10 Botania.
-
-Use at your own risk as bugs may pop up unexpectedly.
-
-As of 2016 02 25, Vazkii has stopped working on Botania. Requests for design changes will still not be accepted here (post them on reddit). Even then, don't expect anything to be added without severe deliberation scrutiny.
-
-Please report all 1.8+ issues to this repository.
-
-These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod.
-
-
-![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png)  
+![](web/img/logo.png)  
 Welcome to the Botania repository.  
 
-Botania is a [Minecraft](https://minecraft.net/) mod based on adding natural magic to the game. It's inspired by other magic mods, such as [Thaumcraft](http://www.minecraftforum.net/topic/2011841-) or [Blood Magic](http://www.minecraftforum.net/topic/1899223-).  
+Botania is a [Minecraft](https://minecraft.net/) mod based on adding natural magic to the game. It's inspired by other magic mods, such as [Thaumcraft](https://www.curseforge.com/minecraft/mc-mods/thaumcraft) or [Blood Magic](https://www.curseforge.com/minecraft/mc-mods/blood-magic).  
 
-Botania by Vazkii is licensed under the [Botania License](http://botaniamod.net/license.php)
+The current iteration of Botania is made possible thanks to the massive help by the part of [williewillus](https://github.com/williewillus), who ported the mod from 1.8 through to the present day, so go buy him a beer or something, I dunno, he's pretty cool.
+
+Botania is licensed under the [Botania License](http://botaniamod.net/license.php)