Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v3.0' into v3.0

This commit is contained in:
RyotaK 2020-01-19 10:14:42 +09:00 committed by GitHub
parent 92dac118be b11420f94b
commit f36404460a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DynmapCore/src/main/resources/models_1.txt
View File

@ -340,15 +340,11 @@ patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=4,data=10,pat
# Activator Rail - ascending to west
patchblock:id=powered_rail,id=detector_rail,id=activator_rail,data=5,data=11,patch0=SlopeXUpZTop@90
# Ladder - attached to east side of block
patchblock:id=ladder,data=2,patch0=VertX0In@270
# Ladder - attached to west side of block
patchblock:id=ladder,data=3,patch0=VertX0In@90
# Ladder - attached to north side of block
patchblock:id=ladder,data=4,patch0=VertX0In@180
# Ladder - attached to south side of block
patchblock:id=ladder,data=5,patch0=VertX0In
# Ladder
patchblock:id=ladder,data=0,data=1,patch0=VertX0In@270
patchblock:id=ladder,data=2,data=3,patch0=VertX0In@90
patchblock:id=ladder,data=4,data=5,patch0=VertX0In@180
patchblock:id=ladder,data=6,data=7,patch0=VertX0In
# Wall sign - facing east
[-1.13.2]patchblock:id=wall_sign,data=0-1,patch0=WSignFront,patch1=WSignBack,patch2=WSignTop,patch3=WSignBottom,patch4=WSignLeft,patch5=WSignRight
[1.14-]patchblock:id=oak_wall_sign,id=birch_wall_sign,id=spruce_wall_sign,id=acacia_wall_sign,id=jungle_wall_sign,id=dark_oak_wall_sign,data=0-1,patch0=WSignFront,patch1=WSignBack,patch2=WSignTop,patch3=WSignBottom,patch4=WSignLeft,patch5=WSignRight

2
build.gradle
View File

@ -19,7 +19,7 @@ allprojects {
apply plugin: 'java'
group = 'us.dynmap'
version = '3.0-beta-9'
version = '3.0-SNAPSHOT'
}

4
forge-1.13.2/build.gradle
View File

@ -18,7 +18,7 @@ apply plugin: 'eclipse'
dependencies {
compile project(":DynmapCore")
compile project(":DynmapCoreAPI")
minecraft 'net.minecraftforge:forge:1.13.2-25.0.215'
minecraft 'net.minecraftforge:forge:1.13.2-25.0.219'
}
sourceCompatibility = 1.8
@ -33,7 +33,7 @@ repositories {
}
minecraft {
mappings channel: 'snapshot', version: '20190530-1.13.2'
mappings channel: 'stable', version: '47-1.13.2'
runs {
server {
workingDirectory project.file('run').canonicalPath

4
settings.gradle
View File

@ -10,7 +10,7 @@ include ':bukkit-helper'
include ':dynmap-api'
include ':DynmapCore'
include ':DynmapCoreAPI'
include ':forge-1.13.2'
//include ':forge-1.13.2'
include ':forge-1.12.2'
include ':forge-1.11.2'
include ':forge-1.10.2'
@ -28,7 +28,7 @@ project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File
project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File
project(':DynmapCoreAPI').projectDir = "$rootDir/DynmapCoreAPI" as File
project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
//project(':forge-1.13.2').projectDir = "$rootDir/forge-1.13.2" as File
project(':forge-1.12.2').projectDir = "$rootDir/forge-1.12.2" as File
project(':forge-1.11.2').projectDir = "$rootDir/forge-1.11.2" as File
project(':forge-1.10.2').projectDir = "$rootDir/forge-1.10.2" as File