backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-18 10:01:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/Azgaar/Fantasy-Map-Generator into alternative-grids

Browse source
This commit is contained in:
Azgaar 2024-07-17 12:28:27 +02:00
commit 3058e89b88
3 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
index.html
View file

@ -1316,6 +1316,12 @@
<td><select id="styleStatesBodyFilter" /></td>
</tr>
<tr style="margin-top: 0.8em">
<td style="font-style: italic">
Halo is only rendered if "Rendering" option is set to "Best quality"!
</td>
</tr>
<tr data-tip="Set states halo effect width">
<td>Halo width</td>
<td>
@ -8104,7 +8110,7 @@
<script src="config/heightmap-templates.js"></script>
<script src="config/precreated-heightmaps.js"></script>
<script src="modules/heightmap-generator.js?v=1.88.00"></script>
<script src="modules/ocean-layers.js?v=1.98.00"></script>
<script src="modules/ocean-layers.js?v=1.98.04"></script>
<script src="modules/river-generator.js?v=1.89.13"></script>
<script src="modules/lakes.js"></script>
<script src="modules/biomes.js"></script>
@ -8127,8 +8133,13 @@
<script src="modules/ui/stylePresets.js?v=1.96.00"></script>
<script src="modules/ui/general.js?v=1.98.01"></script>
<<<<<<< HEAD
<script src="modules/ui/options.js?v=1.98.03"></script>
<script src="main.js?v=1.99.00"></script>
=======
<script src="modules/ui/options.js?v=1.98.04"></script>
<script src="main.js?v=1.98.01"></script>
>>>>>>> a5a638c4394268b425a8181dfbf29d2778c25933
<script defer src="modules/relief-icons.js"></script>
<script defer src="modules/ui/style.js?v=1.96.00"></script>