Merge branch 'mc/1.13' into mc/1.12

Author: TBlueF

BlueMapCore/src/main/webroot/js/libs/hud/MarkerManager.js

@@ -13,7 +13,8 @@ export default class MarkerManager {
 
 		this.readyPromise =
 			this.loadMarkerData()
-			.then(this.loadMarkers);
+				.catch(ignore => {})
+				.then(this.loadMarkers);
 
 		$(document).on('bluemap-map-change', this.onBlueMapMapChange);
 	}
@@ -34,9 +35,11 @@ export default class MarkerManager {
 	}
 
 	loadMarkers = () => {
-		this.markerData.markerSets.forEach(setData => {
-			this.markerSets.push(new MarkerSet(this.blueMap, setData));
-		});
+		if (this.markerData && this.markerData.markerSets) {
+			this.markerData.markerSets.forEach(setData => {
+				this.markerSets.push(new MarkerSet(this.blueMap, setData));
+			});
+		}
 	};
 
 	update(){

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-coreVersion=0.6.0
+coreVersion=0.6.1
 
 targetVersion=mc1.12