Merge branch 'develop'

Conflicts:
	pom.xml

.gitignore

@@ -1,29 +1,134 @@
-# Compiled class file
-*.class
+### Others ###
+*.cmd
+*.sh
+*.prefs
+
+### Maven ###
+/mvn
+/target/lib
+/target/maven-archiver
+/target/classes
+/target/maven-status
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+out/
 
-# Log file
-*.log
 
-# BlueJ files
-*.ctxt
+### Java ###
+*.class
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
-*.nar
 *.ear
-*.zip
-*.tar.gz
-*.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/shelf
+
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+
+# Gradle:
+.idea/gradle.xml
+.idea/libraries
+.gradle
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+
+### Eclipse ###
+*.pydevproject
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
 /target/
+checkstyle.xml
+classes/
 /.DS_Store
-/.classpath
-/.project
-/dependency-reduced-pom.xml
-/.settings/

README.md

@@ -1,15 +1,17 @@
 # Biomes Addon
 [![Discord](https://img.shields.io/discord/272499714048524288.svg?logo=discord)](https://discord.bentobox.world)
 [![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/Biomes)](https://ci.codemc.org/job/BentoBoxWorld/job/Biomes/)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Biomes&metric=bugs)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Biomes)
+[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Biomes&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Biomes)
+[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Biomes&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Biomes)
+[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_Biomes&metric=security_rating)](https://sonarcloud.io/dashboard?id=BentoBoxWorld_Biomes)
 
-Biomes addon for SkyBlock, SkyGrid, CaveBlock and AcidIsland. It allows to change biome on Island.
+Biomes addon for SkyBlock, SkyGrid, CaveBlock and AcidIsland. It allows island biome changing.
 
 ## Where to find
 
-Currently Biomes Addon is in **Beta stage**, so it may or may not contain bugs... a lot of bugs. Also it means, that some features are not working or implemented. 
-Latest official **Beta Release is 1.6.0.1**, and you can download it from [Release tab](https://github.com/BentoBoxWorld/Biomes/releases)
-
-Or you can try **nightly builds** where you can check and test new features that will be implemented in next release from [Jenkins Server](https://ci.codemc.org/job/BentoBoxWorld/job/Biomes/lastStableBuild/).
+Download the latest release from the BentoBox Downloads site (https://download.bentobox.world) or 
+you can try **snapshot builds** where you can check and test new features that will be implemented in next release from [Jenkins Server](https://ci.bentobox.world/Biomes/lastStableBuild/).
 
 If you like this addon but something is missing or is not working as you want, you can always submit an [Issue request](https://github.com/BentoBoxWorld/Biomes/issues) or get a support in Discord [BentoBox ![icon](https://avatars2.githubusercontent.com/u/41555324?s=15&v=4)](https://discord.gg/JgWKvR)
 
@@ -28,15 +30,16 @@ If your language is not in the list, please contact to developers via Discord an
 
 ## Config.yml
 
-After addon is successful installed, it will create config.yml file. Every option in this file comes with comments about them. Please check file for more information.
-Most of options are also editable admin via commands.
+After the addon is successful installed, it will create a config.yml file. Every option in this file comes with comments.
+Please check the file for more information.
+Most options are also editable admin via commands.
 
 ## Biomes.yml
 
 This file contains all necessary information about default biomes. 
 If you change values in biomes.yml, then to apply them, you must run **/bsb biomes import** or **/acid biomes import**.
 
-If you want to force an overwrite of biomes via an import, add the **overwrite** option to the end of the import command.
+If you want to force an overwrite of the biomes via an import, add the **overwrite** option to the end of the import command.
 Note that you must import biomes into both BSkyBlock and AcidIsland separately.
 
 ## User commands

pom.xml

@@ -46,14 +46,14 @@
         <java.version>1.8</java.version>
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.6.0</bentobox.version>
-        <level.version>1.6.0</level.version>
+        <spigot.version>1.16.1-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>1.14.0-SNAPSHOT</bentobox.version>
+        <level.version>2.4.0-SNAPSHOT</level.version>
         <vault.version>1.7</vault.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- This allows to change between versions and snapshots. -->
-        <build.version>1.7.0</build.version>
+        <build.version>1.13.0</build.version>
         <build.number>-LOCAL</build.number>
     </properties>