Merge branch 'dev-1.2.6'

deepnight · Apr 26, 2023 · 95555e6 · 95555e6
2 parents dfd3a61 + 64fc1ff
commit 95555e6
Show file tree

Hide file tree

Showing 153 changed files with 31,005 additions and 4,118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,5 @@ app/assets/js/*.map
 art/export_appElements
 
 tests/_private
+tests/_backups
 tests/*.txt
diff --git a/app/assets/changelogImg/1.3.0/advancedSelect.png b/app/assets/changelogImg/1.3.0/advancedSelect.png
diff --git a/app/assets/changelogImg/1.3.0/backupDir.png b/app/assets/changelogImg/1.3.0/backupDir.png
diff --git a/app/assets/changelogImg/1.3.0/collapsableTag.png b/app/assets/changelogImg/1.3.0/collapsableTag.png
diff --git a/app/assets/changelogImg/1.3.0/compactMode.png b/app/assets/changelogImg/1.3.0/compactMode.png
diff --git a/app/assets/changelogImg/1.3.0/filter.png b/app/assets/changelogImg/1.3.0/filter.png
diff --git a/app/assets/changelogImg/1.3.0/homeColors.png b/app/assets/changelogImg/1.3.0/homeColors.png
diff --git a/app/assets/changelogImg/1.3.0/multiWorlds.png b/app/assets/changelogImg/1.3.0/multiWorlds.png
diff --git a/app/assets/changelogImg/1.3.0/multiWorldsOption.png b/app/assets/changelogImg/1.3.0/multiWorldsOption.png
diff --git a/app/assets/changelogImg/1.3.0/ruleTilesOffsets.png b/app/assets/changelogImg/1.3.0/ruleTilesOffsets.png
diff --git a/app/assets/changelogImg/1.3.0/ruleTilesOffsets2.png b/app/assets/changelogImg/1.3.0/ruleTilesOffsets2.png
diff --git a/app/assets/css/app.min.css b/app/assets/css/app.min.css