Merge branch 'dev'

JujuAdams · Nov 3, 2023 · 43bc8aa · 43bc8aa
2 parents cf34db7 + bdec5ac
commit 43bc8aa
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 1,909 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center"><img src="https://raw.githubusercontent.com/JujuAdams/SNAP/master/LOGO.png" style="display:block; margin:auto; width:300px"></p>
-<h1 align="center">SNAP 6.0.1</h1>
+<h1 align="center">SNAP 6.1.0</h1>
 
 <p align="center">Data format converters for GameMaker Studio 2022 LTS</p>
 

diff --git a/objects/oTestConfigJSON/Create_0.gml b/objects/oTestConfigJSON/Create_0.gml
diff --git a/objects/oTestConfigJSON/oTest.yy b/objects/oTestConfigJSON/oTest.yy
diff --git a/objects/oTestConfigJSON/oTestConfigJSON.yy b/objects/oTestConfigJSON/oTestConfigJSON.yy
diff --git a/objects/oTestLooseJSON/Create_0.gml b/objects/oTestLooseJSON/Create_0.gml
diff --git a/objects/oTestLooseJSON/oTest.yy b/objects/oTestLooseJSON/oTest.yy
diff --git a/objects/oTestLooseJSON/oTestLooseJSON.yy b/objects/oTestLooseJSON/oTestLooseJSON.yy
diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
@@ -4,7 +4,7 @@
   "name": "Windows",
   "option_windows_display_name": "SNAP",
   "option_windows_executable_name": "${project_name}.exe",
-  "option_windows_version": "6.0.1.0",
+  "option_windows_version": "6.1.0.0",
   "option_windows_company_info": "@jujuadams",
   "option_windows_product_info": "SNAP",
   "option_windows_copyright_info": "@jujuadams 2023",