Merge branch 'development'

This commit is contained in:
Christian Koop 2022-01-30 12:15:19 +01:00
commit 30923352a5
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 29 additions and 4 deletions

View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@ -22,7 +22,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId>
<version>2.6.4</version>
<version>2.6.11</version>
<scope>compile</scope>
</dependency>
</dependencies>

View File

@ -4,7 +4,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

View File

@ -326,6 +326,30 @@ trees:
entire-tree-loot: []
required-tools: []
required-axe: false
azalea:
logs:
- OAK_LOG
- STRIPPED_OAK_LOG
- OAK_WOOD
- STRIPPED_OAK_WOOD
leaves:
- AZALEA_LEAVES
- FLOWERING_AZALEA_LEAVES
sapling: AZALEA
plantable-soil: [ ]
max-log-distance-from-trunk: 3
max-leaf-distance-from-log: 4
search-for-leaves-diagonally: true
drop-original-log: true
drop-original-leaf: false
log-loot: [ ]
leaf-loot:
0:
material: AZALEA
chance: 5
entire-tree-loot: [ ]
required-tools: [ ]
required-axe: false
brown_mushroom:
logs:
- MUSHROOM_STEM
@ -419,6 +443,7 @@ global-plantable-soil:
- DIRT
- COARSE_DIRT
- PODZOL
- ROOTED_DIRT
# Custom loot that is available for all tree types
# The loot applies to each log broken in the tree

View File

@ -3,7 +3,7 @@
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.3.0</version>
<version>2.3.1</version>
<packaging>pom</packaging>
<modules>