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

Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0

This commit is contained in:
Michael Primm 2023-04-16 23:53:59 -05:00
parent 022a031829 9c0a1e45fc
commit 8b1b26c570
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DynmapCore/src/main/resources/extracted/web/index.html
View File

@ -9,6 +9,8 @@
<meta name="description" content="Minecraft Dynamic Map" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
<!-- These 2 lines make us fullscreen on apple mobile products - remove if you don't like that -->
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<link rel="apple-touch-icon" sizes="180x180" href="images/icons/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon-32x32.png">

2
DynmapCore/src/main/resources/texture_1.txt
View File

@ -4276,7 +4276,7 @@ block:id=%melon_stem,patch0=0:melon_stem,blockcolor=foliagebiome,transparency=TR
[1.19.4-]block:id=%stripped_cherry_wood,state=axis:x,patch0=0:stripped_cherry_log,stdrot=true
[1.19.4-]block:id=%stripped_cherry_wood,state=axis:y,patch0=0:stripped_cherry_log,patch1=0:stripped_cherry_log,patch2=0:stripped_cherry_log,patch3=0:stripped_cherry_log,patch4=0:stripped_cherry_log,patch5=0:stripped_cherry_log,stdrot=true
[1.19.4-]block:id=%stripped_cherry_wood,state=axis:z,patch0=0:stripped_cherry_log,stdrot=true
[1.19.4-]block:id=%cherry_leaves,patch0=0:cherry_leaves,patch1=0:cherry_leaves,patch2=0:cherry_leaves,patch3=0:cherry_leaves,patch4=0:cherry_leaves,patch5=0:cherry_leaves,blockcolor=foliage,transparency=SEMITRANSPARENT,stdrot=true
[1.19.4-]block:id=%cherry_leaves,patch0=0:cherry_leaves,patch1=0:cherry_leaves,patch2=0:cherry_leaves,patch3=0:cherry_leaves,patch4=0:cherry_leaves,patch5=0:cherry_leaves,transparency=SEMITRANSPARENT,stdrot=true
[1.19.4-]block:id=%cherry_pressure_plate,state=powered:true,patch0=0:cherry_planks,transparency=TRANSPARENT,stdrot=true
[1.19.4-]block:id=%cherry_pressure_plate,state=powered:false,patch0=0:cherry_planks,transparency=TRANSPARENT,stdrot=true
[1.19.4-]block:id=%cherry_trapdoor,state=facing:north/half:top/open:true,patch0=0:cherry_trapdoor,transparency=SEMITRANSPARENT,stdrot=true