Merge pull request #53 from spamviech/development

Release 4.0.0
spamviech · Jan 2, 2024 · 2a0fb64 · 2a0fb64
2 parents ceb37e8 + d644ff7
commit 2a0fb64
Show file tree

Hide file tree

Showing 1,757 changed files with 69,411 additions and 47,163 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,12 @@
 .vscode/
+!/ide_settings_templates/**
 
 .stack-work/
 dist-newstyle/
 dist/
 target/
 __pycache__/
+.mypy_cache/
 *~
 *.o
 
@@ -23,3 +25,9 @@ __pycache__/
 /deps.png
 build_all.sh
 /licenses/_bak/
+
+# versehentlich/testweise gespeicherter Zustand
+/Märklin.zug
+/Lego.zug
+
+/python_scripts/config.ini
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,12 @@
 [submodule "fonts/source-serif"]
 	path = fonts/source-serif
 	url = [email protected]:adobe-fonts/source-serif.git
+[submodule "dockerfiles/docker"]
+	path = dockerfiles/docker
+	url = [email protected]:iced-rs/docker.git
+[submodule "fonts/bootstrap-icons"]
+	path = fonts/bootstrap-icons
+	url = [email protected]:twbs/icons.git
+[submodule "fonts/woff2otf"]
+	path = python_scripts/woff2otf
+	url = [email protected]:hanikesn/woff2otf.git