From 4a90ff18663210964f65b08fe41a7f168491e51f Mon Sep 17 00:00:00 2001
From: Hielke <hielkemaps@gmail.com>
Date: Sat, 2 Mar 2019 16:14:15 +0100
Subject: [PATCH] v3.3.6 Release

:D
---
 Minecraft Note Block Studio.yyp               |  16 ++++++++--------
 datafiles/Data/settings.file                  | Bin 1024 -> 1024 bytes
 datafiles_yy/Data/settings.file               | Bin 0 -> 1024 bytes
 datafiles_yy/Data/settings.file.yy            |   2 +-
 options/windows/options_windows.yy            |   6 +++---
 .../draw_window_update/draw_window_update.gml |   3 ++-
 scripts/macros/macros.gml                     |   4 ++--
 7 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 datafiles_yy/Data/settings.file

diff --git a/Minecraft Note Block Studio.yyp b/Minecraft Note Block Studio.yyp
index 975e33b19..29575c5c1 100644
--- a/Minecraft Note Block Studio.yyp	
+++ b/Minecraft Note Block Studio.yyp	
@@ -1822,14 +1822,6 @@
                 "resourceType": "GMScript"
             }
         },
-        {
-            "Key": "972ca65b-c349-477f-bf0b-1b82d76b1334",
-            "Value": {
-                "id": "0d221288-e9b4-4044-9fa4-6c47f3be4aaa",
-                "resourcePath": "datafiles_yy\\Data\\settings.file.yy",
-                "resourceType": "GMIncludedFile"
-            }
-        },
         {
             "Key": "973ba2b0-e3f1-4b7f-a10b-63282177b7fd",
             "Value": {
@@ -2950,6 +2942,14 @@
                 "resourceType": "GMScript"
             }
         },
+        {
+            "Key": "f30c7dc3-c3f6-455b-aa98-1512c59b26b8",
+            "Value": {
+                "id": "09c43de7-df2f-4605-bdb6-382500c59ca1",
+                "resourcePath": "datafiles_yy\\Data\\settings.file.yy",
+                "resourceType": "GMIncludedFile"
+            }
+        },
         {
             "Key": "f418569b-3bdd-4706-a0e4-364317f54032",
             "Value": {
diff --git a/datafiles/Data/settings.file b/datafiles/Data/settings.file
index dd17fa8c3b35fbce48a9913e89dc42ed05c98218..ea7f010d76fc78c39205e0f3d05e2d7d2ddb2020 100644
GIT binary patch
delta 114
zcmZqRXyDLQWME)$wu%WYPAw{q$tX+AONnvGFVD-#PfRI}DM>9Z(aTFJ&N*{k_lm<)
zhlz|8qKu3TW*B-V9+cVm_zNSq7DEI>7(*+=Du&33jP{cinQJ*&fr^dwjP*<>GNu6l
DhIb>=

delta 96
zcmZqRXyBM=P&(0p-<FY)A%%f~!Nn@Zr6|83DZe5npeR2pHMyiX#y2xBHMuA;tt7@T
yza&+`DJMTUTOqilG$k`X#;G(jC#87eE*UljV?7|;c<l@0L?f@sBFwcDO_BiNt02k%

diff --git a/datafiles_yy/Data/settings.file b/datafiles_yy/Data/settings.file
new file mode 100644
index 0000000000000000000000000000000000000000..ea7f010d76fc78c39205e0f3d05e2d7d2ddb2020
GIT binary patch
literal 1024
zcmc&y%}T>S5dN~eNmHdtOKd$!#gl@fmWp~Rwjv(<tyL?z#5QWNB+x{C0$;|1PvTL~
z7w|daY|_|Tkz54lV|HeCzM0w0W)?to(`<Nl&ogiCEvIeP+y|%YT5ZqtZO>nFF1_x{
z+v02Gqe9$&5k<io4IVk?UdORpJ?qLZ?z_HS-0Hfm+hX0nYj<3;X8D#`cb#j`RG?7(
zj9kegvMh85m!U)|NFhQx^!xNLjtYXJB7hnYWFIyR4H0C44lYOiDzbOX4{bne@Es$?
zKl%l9l1QW%`|^I#ZYtao;NSrd84)jL4@U!^jWJDVTqhMw<9U`Lo#Z)YumaDLPIH}S
zM2_c#LY9%H1rs`xtPIuZf(t_wWJi$|<040SwIAhqKJ=#81WS$FFCnB?lrZFHhr;PC
z1kPb#4#$|sGv2X4@hKkhgl0mor1T1ou!=L3uua{|IHA9<i3ZlOiwzuL8Hcz)o#xe0
YrI|ZP4U_UJ5lTx0vaw%ID*BuJClgL)8UO$Q

literal 0
HcmV?d00001

diff --git a/datafiles_yy/Data/settings.file.yy b/datafiles_yy/Data/settings.file.yy
index 814d52232..5ccd6cffe 100644
--- a/datafiles_yy/Data/settings.file.yy
+++ b/datafiles_yy/Data/settings.file.yy
@@ -1,5 +1,5 @@
 {
-    "id": "972ca65b-c349-477f-bf0b-1b82d76b1334",
+    "id": "f30c7dc3-c3f6-455b-aa98-1512c59b26b8",
     "modelName": "GMIncludedFile",
     "mvc": "1.0",
     "name": "settings.file",
diff --git a/options/windows/options_windows.yy b/options/windows/options_windows.yy
index f68d4d4d2..9381e334a 100644
--- a/options/windows/options_windows.yy
+++ b/options/windows/options_windows.yy
@@ -5,9 +5,9 @@
     "name": "Windows",
     "option_windows_allow_fullscreen_switching": false,
     "option_windows_borderless": false,
-    "option_windows_company_info": "www.stuffbydavid.com",
+    "option_windows_company_info": "https:\/\/github.com\/HielkeMinecraft\/OpenNoteBlockStudio",
     "option_windows_copy_exe_to_dest": false,
-    "option_windows_copyright_info": "(c) Stuff by David",
+    "option_windows_copyright_info": "",
     "option_windows_description_info": "Minecraft Note Block Studio",
     "option_windows_display_cursor": true,
     "option_windows_display_name": "Minecraft Note Block Studio",
@@ -29,7 +29,7 @@
     "option_windows_texture_page": "2048x2048",
     "option_windows_use_splash": false,
     "option_windows_version": {
-        "build": 5,
+        "build": 6,
         "major": 3,
         "minor": 3,
         "revision": 0
diff --git a/scripts/draw_window_update/draw_window_update.gml b/scripts/draw_window_update/draw_window_update.gml
index 0d8aa51f3..a36f02762 100644
--- a/scripts/draw_window_update/draw_window_update.gml
+++ b/scripts/draw_window_update/draw_window_update.gml
@@ -8,7 +8,8 @@ if (window = w_update) draw_text(x1 + 8, y1 + 8, "Update")
 else draw_text(x1 + 8, y1 + 8, "Changelist")
 draw_set_font(fnt_main)
 if (window = w_update) draw_text(x1 + 32, y1 + 32, "Thank you for upgrading to version " + version + "!")
-fullstr =  "Changes in v3.3.5 (2019.01.20):\n* Added option to export song as datapack. File -> Export as Datapack\n\n"
+fullstr =  "Changes in v3.3.6 (2019.03.02):\n* Added new note block sounds: Iron Xylophone, Cow Bell, Didgeridoo,\n   Bit, Banjo and Pling.\n* Updated Icon.\n* Updated note block texture\n\n"
+fullstr += "Changes in v3.3.5 (2019.01.20):\n* Added option to export song as datapack. File -> Export as Datapack\n\n"
 fullstr += "Changes in v3.3.4 (2018.02.01):\n* Fixed a crash when importing certain MIDI files.\n\n"
 fullstr += "Changes in v3.3.3 (2017.06.10):\n* Stability fixes.\n\n"
 fullstr += "Changes in v3.3.2 (2017.06.02):\n* Added new note block sounds: Guitar, Flute, Bell, Chime and Xylophone.\n* Added new blocks to the schematic exporter.\n* Added an option to export schematics for old Minecraft versions.\n* Fixed an audio stuttering bug for imported sounds.\n\n"
diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml
index ead05b16c..b2d3562d6 100644
--- a/scripts/macros/macros.gml
+++ b/scripts/macros/macros.gml
@@ -1,6 +1,6 @@
 #macro gm_runtime_version "2.1.5.246"
-#macro version_date "2019.01.20"
-#macro version "3.3.5"
+#macro version_date "2019.03.02"
+#macro version "3.3.6"
 
 #macro link_download "https://github.com/HielkeMinecraft/OpenNoteBlockStudio/releases/latest"
 #macro link_topic "https://www.minecraftforum.net/forums/mapping-and-modding-java-edition/minecraft-tools/2945101-open-minecraft-note-block-studio"