Skip to content

Commit a657b23

Browse files
committed
Merge develop branch into master.
2 parents 9583655 + 7a2f95b commit a657b23

49 files changed

Lines changed: 6400 additions & 4073 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@
2121

2222
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2323
hs_err_pid*
24+
/target/
25+
/.DS_Store
26+
/.classpath
27+
/.project
28+
/dependency-reduced-pom.xml

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# Biomes Addon
2+
[![Discord](https://img.shields.io/discord/272499714048524288.svg?logo=discord)](https://discord.bentobox.world)
23
[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/Biomes)](https://ci.codemc.org/job/BentoBoxWorld/job/Biomes/)
34

45
Biomes addon for SkyBlock, SkyGrid, CaveBlock and AcidIsland. It allows to change biome on Island.
56

67
## Where to find
78

8-
Currently Biomes Addon is in **Alpha stage**, so it may or may not contain bugs... a lot of bugs. Also it means, that some features are not working or implemented.
9-
Latest official **Alpha Release is 0.4.5**, and you can download it from [Release tab](https://github.com/BentoBoxWorld/Biomes/releases)
9+
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.
10+
Latest official **Beta Release is 1.5.0.0**, and you can download it from [Release tab](https://github.com/BentoBoxWorld/Biomes/releases)
1011

1112
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/).
1213

‎pom.xml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747
<powermock.version>1.7.4</powermock.version>
4848
<!-- More visible way how to change dependency versions -->
4949
<spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
50-
<bentobox.version>1.4.0</bentobox.version>
51-
<level.version>1.3.0</level.version>
50+
<bentobox.version>1.5.0</bentobox.version>
51+
<level.version>1.4.0</level.version>
5252
<vault.version>1.7</vault.version>
5353
<anvilgui.version>1.2.1-SNAPSHOT</anvilgui.version>
5454
<!-- Revision variable removes warning about dynamic version -->
5555
<revision>${build.version}-SNAPSHOT</revision>
5656
<!-- This allows to change between versions and snapshots. -->
57-
<build.version>0.4.5</build.version>
57+
<build.version>1.5.0.0</build.version>
5858
<build.number>-LOCAL</build.number>
5959
</properties>
6060

@@ -70,7 +70,7 @@
7070
</activation>
7171
<properties>
7272
<!-- Override only if necessary -->
73-
<build.number>-#${env.BUILD_NUMBER}</build.number>
73+
<build.number>-b${env.BUILD_NUMBER}</build.number>
7474
<!-- GIT_BRANCH -->
7575
</properties>
7676
</profile>
@@ -126,6 +126,12 @@
126126
<version>${bentobox.version}</version>
127127
<scope>provided</scope>
128128
</dependency>
129+
<dependency>
130+
<groupId>world.bentobox</groupId>
131+
<artifactId>level</artifactId>
132+
<version>${level.version}</version>
133+
<scope>provided</scope>
134+
</dependency>
129135
<dependency>
130136
<groupId>net.wesjd</groupId>
131137
<artifactId>anvilgui</artifactId>
@@ -140,6 +146,14 @@
140146
</dependencies>
141147

142148
<build>
149+
<!-- By default ${revision} is ${build.version}-SNAPSHOT -->
150+
<!-- If GIT_BRANCH variable is set to origin/master, then it will be only ${build.version}. -->
151+
152+
<!-- By default ${build.number} is -LOCAL. -->
153+
<!-- If the BUILD_NUMBER variable is set, then it will be -b[number]. -->
154+
<!-- If GIT_BRANCH variable is set to origin/master, then it will be the empty string. -->
155+
<finalName>${project.name}-${revision}${build.number}</finalName>
156+
143157
<defaultGoal>clean package</defaultGoal>
144158
<resources>
145159
<resource>

0 commit comments

Comments
 (0)