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-27 14:50:40 +02:00
commit 06c4f78c35
3 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
index.html
View file

@ -8133,13 +8133,8 @@
<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 src="main.js?v=1.98.05"></script>
<script defer src="modules/relief-icons.js"></script>
<script defer src="modules/ui/style.js?v=1.96.00"></script>
@ -8183,7 +8178,7 @@
<script defer src="modules/io/save.js?v=1.99.00"></script>
<script defer src="modules/io/load.js?v=1.98.01"></script>
<script defer src="modules/io/cloud.js?v=1.96.00"></script>
<script defer src="modules/io/export.js?v=1.98.01"></script>
<script defer src="modules/io/export.js?v=1.98.05"></script>
<!-- Web Components -->
<script defer src="components/fill-box.js"></script>