diff --git a/index.html b/index.html index a435d974..5bfc01b4 100644 --- a/index.html +++ b/index.html @@ -102,9 +102,9 @@ } } - + - + - + - + - + - - + + - + - + @@ -6112,23 +6112,23 @@ - - - + + + - - - - - - + + + + + + - + - + @@ -6138,30 +6138,30 @@ - + - - - - - + + + + + - - + + - - + + - + diff --git a/main.js b/main.js index 2b4356b6..2d402d64 100644 --- a/main.js +++ b/main.js @@ -1912,8 +1912,8 @@ const regenerateMap = debounce(async function (options) { const cellsDesired = +byId("pointsInput").dataset.cells; const shouldShowLoading = cellsDesired > 10000; - shouldShowLoading && showLoading(); + closeDialogs("#worldConfigurator, #options3d"); customization = 0; resetZoom(1000); @@ -1922,7 +1922,9 @@ const regenerateMap = debounce(async function (options) { restoreLayers(); if (ThreeD.options.isOn) ThreeD.redraw(); if ($("#worldConfigurator").is(":visible")) editWorld(); + shouldShowLoading && hideLoading(); + clearMainTip(); }, 1000); // clear the map diff --git a/modules/io/load.js b/modules/io/load.js index 5bd8c69d..acf05abe 100644 --- a/modules/io/load.js +++ b/modules/io/load.js @@ -427,7 +427,7 @@ async function parseLoadedData(data) { { // dynamically import and run auto-udpdate script const versionNumber = parseFloat(params[0]); - const {resolveVersionConflicts} = await import("../dynamic/auto-update.js"); + const {resolveVersionConflicts} = await import("../dynamic/auto-update.js?v=29052022"); resolveVersionConflicts(versionNumber); } diff --git a/modules/ui/editors.js b/modules/ui/editors.js index 494a6270..97f28a27 100644 --- a/modules/ui/editors.js +++ b/modules/ui/editors.js @@ -1119,12 +1119,12 @@ function refreshAllEditors() { // dynamically loaded editors async function editStates() { if (customization) return; - const StateEditor = await import("../dynamic/editors/states-editor.js?v=20052022"); + const StateEditor = await import("../dynamic/editors/states-editor.js?v=29052022"); StateEditor.open(); } async function editCultures() { if (customization) return; - const CulturesEditor = await import("../dynamic/editors/cultures-editor.js?v=20052022"); + const CulturesEditor = await import("../dynamic/editors/cultures-editor.js?v=29052022"); CulturesEditor.open(); } diff --git a/modules/ui/options.js b/modules/ui/options.js index 522c50ea..c874e0ac 100644 --- a/modules/ui/options.js +++ b/modules/ui/options.js @@ -623,7 +623,7 @@ function changeEra() { } async function openTemplateSelectionDialog() { - const HeightmapSelectionDialog = await import("../dynamic/heightmap-selection.js"); + const HeightmapSelectionDialog = await import("../dynamic/heightmap-selection.js?v=290520222"); HeightmapSelectionDialog.open(); } diff --git a/versioning.js b/versioning.js index 3a934a0a..b6f62996 100644 --- a/versioning.js +++ b/versioning.js @@ -28,6 +28,8 @@ const version = "1.84.0"; // generator version, update each time

Join our Discord server and Reddit community to ask questions, share maps, discuss the Generator and Worlbuilding, report bugs and propose new features.