diff --git a/DynmapCore/.gitignore b/DynmapCore/.gitignore index 84c048a7..7657a96c 100644 --- a/DynmapCore/.gitignore +++ b/DynmapCore/.gitignore @@ -1 +1,2 @@ /build/ +/bin/ \ No newline at end of file diff --git a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java index 1cd166a3..1ff2d58f 100644 --- a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java +++ b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java @@ -2288,8 +2288,9 @@ public class DynmapCore implements DynmapCommonAPI { else { // First time, delete old external texture pack deleteDirectory(new File(df, "texturepacks/standard")); } + String curver = this.getDynmapCoreVersion(); /* If matched, we're good */ - if (prevver.equals(this.getDynmapCoreVersion())) { + if (prevver.equals(curver) && (!curver.endsWith(("-Dev")))) { return; } /* Get deleted file list */ diff --git a/DynmapCore/src/main/resources/extracted/web/js/coord.js b/DynmapCore/src/main/resources/extracted/web/js/coord.js index b97225c6..7ab346e2 100644 --- a/DynmapCore/src/main/resources/extracted/web/js/coord.js +++ b/DynmapCore/src/main/resources/extracted/web/js/coord.js @@ -6,21 +6,21 @@ componentconstructors['coord'] = function(dynmap, configuration) { chunkfield: $(''), onAdd: function(map) { - if(configuration.hidey) + if(configuration.hidey) this._container = L.DomUtil.create('div', 'coord-control coord-control-noy'); else this._container = L.DomUtil.create('div', 'coord-control'); this._map = map; $('').addClass('coord-control-label').text((configuration.label || 'x,y,z') + ': ').appendTo(this._container); $('
').appendTo(this._container); - this.valfield.addClass('coord-control-value').text('').appendTo(this._container); + this.valfield.addClass('coord-control-value').text(configuration.hidey ? '---,---' : '---,---,---').appendTo(this._container); if(configuration['show-mcr']) { $('
').appendTo(this._container); - this.mcrfield.addClass('coord-control-value').text('').appendTo(this._container); + this.mcrfield.addClass('coord-control-value').text('--------').appendTo(this._container); } if(configuration['show-chunk']) { $('
').appendTo(this._container); - this.chunkfield.addClass('coord-control-value').text('').appendTo(this._container); + this.chunkfield.addClass('coord-control-value').text('Chunk: ---,---').appendTo(this._container); } this._update(); return this.getContainer();