rename

objects/o_main/Create_0.gml

@@ -69,6 +69,9 @@
 	TUNNELS_IN = ds_map_create();
 	TUNNELS_IN_MAP = ds_map_create();
 	TUNNELS_OUT = ds_map_create();
+	
+	globalvar AUTO_SAVE_TIMER;
+	AUTO_SAVE_TIMER = 0;
 #endregion
 
 #region file drop
@@ -181,8 +184,15 @@
 #region steam
 	globalvar STEAM_ENABLED, STEAM_APP_ID, STEAM_USER_ID, STEAM_USERNAME;
 	globalvar STEAM_UGC_ITEM_UPLOADING, STEAM_UGC_ITEM_ID, STEAM_UGC_ITEM_FILE, STEAM_UGC_UPDATE_HANDLE;
-	globalvar STEAM_UGC_SUBMIT_ID, STEAM_UGC_UPDATE_MAP, STEAM_UGC_PUBLISH_ID, STEAM_UGC_UPDATE;
+	globalvar STEAM_UGC_SUBMIT_ID, STEAM_UGC_UPDATE_MAP, STEAM_UGC_PUBLISH_ID, STEAM_UGC_UPDATE, STEAM_UGC_TYPE;
 	
+	enum STEAM_UGC_FILE_TYPE {
+		collection,
+		project,
+		node_preset
+	}
+	
+	STEAM_UGC_TYPE = STEAM_UGC_FILE_TYPE.collection;
 	STEAM_USER_ID = 0;
 	STEAM_USERNAME = "";
 	

objects/o_main/Other_2.gml

@@ -14,11 +14,6 @@
 	log_message("SESSION", "Begin");
 	log_message("DIRECTORY", DIRECTORY);
 	
-	PREF_LOAD();
-	loadFonts();
-	loadGraphic(PREF_MAP[? "theme"]);
-	loadColor(PREF_MAP[? "theme"]);
-	
 	__initLocale();
 	__init_theme();
 	__initCollection();
@@ -29,6 +24,11 @@
 	__init_node_guide();
 	__initSteamUGC();
 	
+	PREF_LOAD();
+	loadFonts();
+	loadGraphic(PREF_MAP[? "theme"]);
+	loadColor(PREF_MAP[? "theme"]);
+	
 	setPanel();
 	
 	if(file_exists("icon.png"))

scripts/panel_collection/panel_collection.gml

@@ -55,7 +55,7 @@ function Panel_Collection() : PanelContent() constructor {
 			var meta = _menu_node.getMetadata();
 			
 			if(!meta.steam) {
-				array_insert(contentMenu, 2, [  get_text("panel_collection_workshop_upload", "Upload to Workshop") + "...", function() { 
+				array_insert(contentMenu, 2, [  get_text("panel_collection_workshop_upload", "Upload to Steam Workshop") + "...", function() { 
 					var dia = dialogCall(o_dialog_file_name_collection, mouse_mx + ui(8), mouse_my + ui(-320));
 					var meta = _menu_node.getMetadata();
 					if(meta != noone && meta != undefined) 
@@ -68,7 +68,7 @@ function Panel_Collection() : PanelContent() constructor {
 			}
 			
 			if(meta.steam && meta.author_steam_id == STEAM_USER_ID && meta.file_id != 0) {
-				array_insert(contentMenu, 2, [get_text("panel_collection_workshop_update", "Update workshop content") + "...", function() { 
+				array_insert(contentMenu, 2, [get_text("panel_collection_workshop_update", "Update Steam Workshop content") + "...", function() { 
 					var dia = dialogCall(o_dialog_file_name_collection, mouse_mx + ui(8), mouse_my + ui(-320));
 					var meta = _menu_node.getMetadata();
 					if(meta != noone && meta != undefined) 
@@ -95,12 +95,12 @@ function Panel_Collection() : PanelContent() constructor {
 		draw_clear_alpha(c_white, 0);
 		
 		var nodes = search_string == ""? context.content : search_list;
-		if(mode == 0 && context == root) nodes = STEAM_CONTENT;
+		if(mode == 0 && context == root) nodes = STEAM_COLLECTION;
 		var steamNode = [];
-		for( var i = 0; i < ds_list_size(STEAM_CONTENT); i++ ) {
+		for( var i = 0; i < ds_list_size(STEAM_COLLECTION); i++ ) {
-			var meta = STEAM_CONTENT[| i].meta;	
+			var meta = STEAM_COLLECTION[| i].meta;	
 			if(array_exists(meta.tags, context.name))
-				array_push(steamNode, STEAM_CONTENT[| i]);	
+				array_push(steamNode, STEAM_COLLECTION[| i]);	
 		}
 		
 		var node_list  = ds_list_size(nodes);

scripts/panel_inspector/panel_inspector.gml

@@ -46,6 +46,7 @@ function Panel_Inspector() : PanelContent() constructor {
 	meta_tb[1] = new textArea(TEXTBOX_INPUT.text, function(str) { current_meta.author		= str; });
 	meta_tb[2] = new textArea(TEXTBOX_INPUT.text, function(str) { current_meta.contact		= str; });
 	meta_tb[3] = new textArea(TEXTBOX_INPUT.text, function(str) { current_meta.alias		= str; });
+	meta_tb[4] = new textArrayBox(noone, META_TAGS);
 	for( var i = 0; i < array_length(meta_tb); i++ )
 		meta_tb[i].hide = true;
 	
@@ -53,6 +54,8 @@ function Panel_Inspector() : PanelContent() constructor {
 	
 	var_editing = false;
 	
+	workshop_uploading = false;
+	
 	addHotkey("Inspector", "Copy property",		"C",   MOD_KEY.ctrl,	function() { propSelectCopy(); });
 	addHotkey("Inspector", "Paste property",	"V",   MOD_KEY.ctrl,	function() { propSelectPaste(); });
 	addHotkey("Inspector", "Toggle animation",	"I",   MOD_KEY.none,	function() { anim_toggling = true; });
@@ -122,6 +125,7 @@ function Panel_Inspector() : PanelContent() constructor {
 			if(i == 0) {
 				var is_author = meta.author_steam_id == 0 || meta.author_steam_id == STEAM_USER_ID;
 				meta.displays[1][1].interactable = is_author;
+				meta.displays[2][1].interactable = is_author;
 				current_meta = meta;
 				
 				for( var j = 0; j < array_length(meta.displays); j++ ) {
@@ -135,7 +139,20 @@ function Panel_Inspector() : PanelContent() constructor {
 					meta_tb[j].setActiveFocus(pFOCUS, _hover);
 					if(pFOCUS) meta_tb[j].register(contentPane);
 					
-					var wh = meta_tb[j].draw(ui(16), yy, w - ui(16 + 48), display[2], display[1](meta), _m);
+					var wh;
+					
+					switch(instanceof(meta_tb[j])) {
+						case "textArea" :	
+							wh = meta_tb[j].draw(ui(16), yy, w - ui(16 + 48), display[2], display[1](meta), _m);
+							break;
+						case "textArrayBox" :	
+							meta_tb[j].arraySet = current_meta.tags;
+							var rx = x + ui(16);
+							var ry = y + top_bar_h;
+							wh = meta_tb[j].draw(ui(16), yy, w - ui(16 + 48), display[2], _m, rx, ry);
+							break;
+					}
+					
 					yy += wh + ui(8);
 					hh += wh + ui(8);
 				}
@@ -699,6 +716,32 @@ function Panel_Inspector() : PanelContent() constructor {
 				file_text_write_string(f, json_encode_minify(METADATA.serialize()));
 				file_text_close(f);
 			}
+			
+			by += ui(36);
+			if(CURRENT_PATH != "" && STEAM_ENABLED && !workshop_uploading) {
+				if(!METADATA.steam) {
+					if(buttonInstant(THEME.button_hide, bx, by, ui(32), ui(32), [mx, my], pFOCUS, pHOVER, "Upload to Steam Workshop", THEME.workshop_upload, 0, COLORS._main_icon) == 2) {
+						METADATA.author_steam_id = STEAM_USER_ID;
+						SAVE();
+						steam_ugc_create_project();
+						workshop_uploading = true;
+					}
+				}
+				
+				if(METADATA.steam && METADATA.author_steam_id == STEAM_USER_ID && METADATA.file_id != 0) {
+					if(buttonInstant(THEME.button_hide, bx, by, ui(32), ui(32), [mx, my], pFOCUS, pHOVER, "Update Steam Workshop", THEME.workshop_update, 0, COLORS._main_icon) == 2) {
+						SAVE();
+						steam_ugc_update_project();
+						workshop_uploading = true;
+					}
+				}
+			}
+			
+			if(workshop_uploading) {
+				draw_sprite_ui(THEME.loading_s, 0, bx + ui(16), by + ui(16),,, current_time / 5, COLORS._main_icon);
+				if(STEAM_UGC_ITEM_UPLOADING == false)
+					workshop_uploading = false;
+			}
 		}
 		
 		contentPane.active = pHOVER;

scripts/preferences/preferences.gml

@@ -53,6 +53,8 @@
 	PREF_MAP[? "physics_gravity"] = [ 0, 10 ];
 	
 	PREF_MAP[? "test_mode"] = false;
+	
+	PREF_MAP[? "auto_save_time"] = 300;
 #endregion
 
 #region hotkeys	

scripts/save_function/save_function.gml

@@ -86,7 +86,7 @@ function SAVE_AS() {
 	return true;
 }
 
-function SAVE_AT(path) {
+function SAVE_AT(path, log = "save at ") {
 	if(DEMO) return false;
 	
 	if(file_exists(path))
@@ -98,7 +98,7 @@ function SAVE_AT(path) {
 	READONLY  = false;
 	MODIFIED  = false;
 	
-	log_message("FILE", "save at " + path, THEME.noti_icon_file_save);
+	log_message("FILE", log + path, THEME.noti_icon_file_save);
 	PANEL_MENU.setNotiIcon(THEME.noti_icon_file_save);
 	
 	return true;

scripts/steam_ugc_collection/steam_ugc_collection.gml

@@ -1,58 +1,65 @@
-function __initSteamUGC() {
+function steam_ugc_create_collection(file) {
-	globalvar STEAM_SUBS, STEAM_CONTENT;
+	if(STEAM_UGC_ITEM_UPLOADING) return;
-	STEAM_SUBS = ds_list_create();
-	STEAM_CONTENT = ds_list_create();
 	
-	if(!STEAM_ENABLED) return;
+	STEAM_UGC_UPDATE = false;
+	STEAM_UGC_ITEM_UPLOADING = true;
+	STEAM_UGC_ITEM_FILE = file;
+	STEAM_UGC_TYPE = STEAM_UGC_FILE_TYPE.collection;
 	
-	steam_ugc_get_subscribed_items(STEAM_SUBS);
+	directory_destroy(DIRECTORY + "steamUGC");
+	directory_create(DIRECTORY + "steamUGC");
+	file_copy(file.path, DIRECTORY + "steamUGC/" + filename_name(file.path));
+	file_copy(file.spr_path[0], DIRECTORY + "steamUGC/" + filename_name(file.spr_path[0]));
+	steam_ugc_collection_generate(file);
 	
-	for( var i = 0; i < ds_list_size(STEAM_SUBS); i++ ) {
+	STEAM_UGC_ITEM_ID = steam_ugc_create_item(STEAM_APP_ID, ugc_filetype_community);
-		var item_map = ds_map_create();
-		//print("Querying item ID " + string(STEAM_SUBS[| i]));
-		
-		if (steam_ugc_get_item_install_info(STEAM_SUBS[| i], item_map)) {
-			var info_map = ds_map_create();
-			var _update  = false;
-			
-			if (steam_ugc_get_item_update_info(STEAM_SUBS[| i], info_map))
-			    _update = info_map[? "needs_update"];
-			
-			ds_map_destroy(info_map);
-			
-			if(_update) {
-				steam_ugc_subscribe_item(STEAM_SUBS[| i]);
-				//print("Item need update");
-			} else {
-				__loadSteamUGC(STEAM_SUBS[| i], item_map);
-			}
-		} else {
-			steam_ugc_subscribe_item(STEAM_SUBS[| i]);
-			//print("Item not downloaded");
 }
 
-		ds_map_destroy(item_map);
+function steam_ugc_update_collection(file, update_preview = false) {
-	}
+	if(STEAM_UGC_ITEM_UPLOADING) return;
+	
+	STEAM_UGC_UPDATE = true;
+	STEAM_UGC_ITEM_UPLOADING = true;
+	STEAM_UGC_ITEM_FILE = file;
+	STEAM_UGC_TYPE = STEAM_UGC_FILE_TYPE.collection;
+	
+	directory_destroy(DIRECTORY + "steamUGC");
+	directory_create(DIRECTORY + "steamUGC");
+	file_copy(file.path, DIRECTORY + "steamUGC/" + filename_name(file.path));
+	file_copy(file.spr_path[0], DIRECTORY + "steamUGC/" + filename_name(file.spr_path[0]));
+	
+	STEAM_UGC_PUBLISH_ID = file.meta.file_id;
+	STEAM_UGC_UPDATE_HANDLE = steam_ugc_start_item_update(STEAM_APP_ID, STEAM_UGC_PUBLISH_ID);
+	
+	steam_ugc_set_item_title(STEAM_UGC_UPDATE_HANDLE, STEAM_UGC_ITEM_FILE.meta.name);
+	steam_ugc_set_item_description(STEAM_UGC_UPDATE_HANDLE, STEAM_UGC_ITEM_FILE.meta.description);
+	
+	array_insert(STEAM_UGC_ITEM_FILE.meta.tags, 0, "Collection");
+	steam_ugc_set_item_tags(STEAM_UGC_UPDATE_HANDLE, STEAM_UGC_ITEM_FILE.meta.tags);
+	steam_ugc_set_item_content(STEAM_UGC_UPDATE_HANDLE, DIRECTORY + "steamUGC");
+	
+	STEAM_UGC_SUBMIT_ID = steam_ugc_submit_item_update(STEAM_UGC_UPDATE_HANDLE, "Updated");
 }
 
-function __loadSteamUGC(file_id, item_map) {
+function steam_ugc_collection_generate(file, dest_path = DIRECTORY + "steamUGCthumbnail.png") {
-	var _path = item_map[? "folder"];
+	file_delete(dest_path);
-	var f = file_find_first(_path + "\\*.pxcc", 0);
+	var spr       = STEAM_UGC_ITEM_FILE.getSpr();
-	file_find_close();
+	var prev_size = 512;
+	var _s = surface_create(prev_size, prev_size);
+	surface_set_target(_s);
+		draw_clear(COLORS._main_icon_dark);
+		draw_sprite_tiled(s_workshop_bg, 0, -64, -64);
+		draw_sprite_stretched(s_workshop_frame, 0, 0, 0, prev_size, prev_size);
 		
-	var name = string_replace(filename_name(f), ".pxcc", "");
+		if(spr == -1) spr = THEME.group;
-	var file = new FileObject(name, _path + "\\" + f);
+		var ss = (prev_size - 160) / max(sprite_get_width(spr), sprite_get_height(spr));
-	var icon_path = string_replace(_path + "\\" + f, ".pxcc", ".png");
+		var ox = (sprite_get_xoffset(spr) - sprite_get_width(spr) / 2) * ss;
-	var _temp = sprite_add(icon_path, 0, false, false, 0, 0);
+		var oy = (sprite_get_yoffset(spr) - sprite_get_height(spr) / 2) * ss;
-	var ww = sprite_get_width(_temp);
+		draw_sprite_ext(spr, 0, prev_size / 2 + ox, prev_size / 2 + oy, ss, ss, 0, c_white, 1);
-	var hh = sprite_get_height(_temp);
-	var amo = ww % hh == 0? ww / hh : 1;
-	sprite_delete(_temp);
-	file.spr_path = [icon_path, amo, false];
 		
-	ds_list_add(STEAM_CONTENT, file);
+		draw_sprite_stretched(s_workshop_badge, 0, 8, 8, 88, 88);
-				
+		draw_sprite_ext(THEME.group, 0, 40, 40, 1, 1, 0, COLORS._main_icon_dark, 1);
-	var meta = file.getMetadata();
+	surface_reset_target();
-	meta.steam = true;
+	surface_save(_s, dest_path);
-	meta.file_id = file_id;
+	surface_free(_s);
 }

scripts/steam_ugc_functions/steam_ugc_functions.yy

@@ -0,0 +1,11 @@
+{
+  "resourceType": "GMScript",
+  "resourceVersion": "1.0",
+  "name": "steam_ugc_functions",
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "UGC",
+    "path": "folders/Steamworks/UGC.yy",
+  },
+}

scripts/steam_ugc_project/steam_ugc_project.yy

@@ -0,0 +1,11 @@
+{
+  "resourceType": "GMScript",
+  "resourceVersion": "1.0",
+  "name": "steam_ugc_project",
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "UGC",
+    "path": "folders/Steamworks/UGC.yy",
+  },
+}

shaders/sh_2d_light/sh_2d_light.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_2d_light",
+  "type": 1,
   "parent": {
     "name": "blend",
     "path": "folders/shader/blend.yy",
   },
-  "type": 1,
 }

shaders/sh_alpha_cutoff/sh_alpha_cutoff.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_alpha_cutoff",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_alpha_grey/sh_alpha_grey.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_alpha_grey",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_alpha_hash/sh_alpha_hash.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_alpha_hash",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_ani_noise/sh_ani_noise.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_ani_noise",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_atlas/sh_atlas.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_atlas",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_average/sh_average.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_average",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_bevel/sh_bevel.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_bevel",
+  "type": 1,
   "parent": {
     "name": "3d",
     "path": "folders/shader/3d.yy",
   },
-  "type": 1,
 }

shaders/sh_blend_alpha_addition/sh_blend_alpha_addition.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blend_alpha_addition",
+  "type": 1,
   "parent": {
     "name": "blend",
     "path": "folders/shader/blend.yy",
   },
-  "type": 1,
 }

shaders/sh_bloom_pass/sh_bloom_pass.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_bloom_pass",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_alpha/sh_blur_alpha.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_alpha",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_bokeh/sh_blur_bokeh.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_bokeh",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_box_contrast/sh_blur_box_contrast.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_box_contrast",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_directional/sh_blur_directional.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_directional",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_final/sh_blur_final.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_final",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_gaussian/sh_blur_gaussian.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_gaussian",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_radial/sh_blur_radial.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_radial",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_simple/sh_blur_simple.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_simple",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_blur_zoom/sh_blur_zoom.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_blur_zoom",
+  "type": 1,
   "parent": {
     "name": "blur",
     "path": "folders/shader/blur.yy",
   },
-  "type": 1,
 }

shaders/sh_bw/sh_bw.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_bw",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_camera/sh_camera.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_camera",
+  "type": 1,
   "parent": {
     "name": "shader",
     "path": "folders/shader.yy",
   },
-  "type": 1,
 }

shaders/sh_cell_noise/sh_cell_noise.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_cell_noise",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_cell_noise_crystal/sh_cell_noise_crystal.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_cell_noise_crystal",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_cell_noise_edge/sh_cell_noise_edge.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_cell_noise_edge",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_cell_noise_random/sh_cell_noise_random.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_cell_noise_random",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_cell_noise_round/sh_cell_noise_round.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_cell_noise_round",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_A/sh_channel_A.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_A",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_B/sh_channel_B.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_B",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_B_grey/sh_channel_B_grey.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_B_grey",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_G/sh_channel_G.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_G",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_G_grey/sh_channel_G_grey.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_G_grey",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_H/sh_channel_H.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_H",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_R/sh_channel_R.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_R",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_R_grey/sh_channel_R_grey.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_R_grey",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_S/sh_channel_S.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_S",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_channel_V/sh_channel_V.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_channel_V",
+  "type": 1,
   "parent": {
     "name": "channels",
     "path": "folders/shader/channels.yy",
   },
-  "type": 1,
 }

shaders/sh_checkerboard/sh_checkerboard.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_checkerboard",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_chromatic_aberration/sh_chromatic_aberration.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_chromatic_aberration",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_clean_shape/sh_clean_shape.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_clean_shape",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_color_adjust/sh_color_adjust.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_color_adjust",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_color_picker_hue/sh_color_picker_hue.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_color_picker_hue",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_color_picker_value/sh_color_picker_value.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_color_picker_value",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_color_remove/sh_color_remove.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_color_remove",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_color_replace/sh_color_replace.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_color_replace",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_colorize/sh_colorize.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_colorize",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_combine_hsv/sh_combine_hsv.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_combine_hsv",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_combine_rgb/sh_combine_rgb.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_combine_rgb",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_content_sampler/sh_content_sampler.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_content_sampler",
+  "type": 1,
   "parent": {
     "name": "shader",
     "path": "folders/shader.yy",
   },
-  "type": 1,
 }

shaders/sh_convolution/sh_convolution.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_convolution",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_corner/sh_corner.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_corner",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_corner_erode/sh_corner_erode.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_corner_erode",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_curve/sh_curve.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_curve",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_de_corner/sh_de_corner.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_de_corner",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_de_stray/sh_de_stray.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_de_stray",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_dilate/sh_dilate.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_dilate",
+  "type": 1,
   "parent": {
     "name": "warp",
     "path": "folders/shader/warp.yy",
   },
-  "type": 1,
 }

shaders/sh_displace/sh_displace.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_displace",
+  "type": 1,
   "parent": {
     "name": "warp",
     "path": "folders/shader/warp.yy",
   },
-  "type": 1,
 }

shaders/sh_dither/sh_dither.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_dither",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_draw_normal/sh_draw_normal.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_draw_normal",
+  "type": 1,
   "parent": {
     "name": "blend",
     "path": "folders/shader/blend.yy",
   },
-  "type": 1,
 }

shaders/sh_draw_surface_part_tiled/sh_draw_surface_part_tiled.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_draw_surface_part_tiled",
+  "type": 1,
   "parent": {
     "name": "draw",
     "path": "folders/shader/draw.yy",
   },
-  "type": 1,
 }

shaders/sh_draw_vertex_aa/sh_draw_vertex_aa.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_draw_vertex_aa",
+  "type": 1,
   "parent": {
     "name": "draw",
     "path": "folders/shader/draw.yy",
   },
-  "type": 1,
 }

shaders/sh_edge_detect/sh_edge_detect.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_edge_detect",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_erode/sh_erode.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_erode",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_add_velocity_glsl/sh_fd_add_velocity_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_add_velocity_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_advect_material_a_16_glsl/sh_fd_advect_material_a_16_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_advect_material_a_16_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_advect_material_a_8_glsl/sh_fd_advect_material_a_8_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_advect_material_a_8_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_advect_material_rgba_16_glsl/sh_fd_advect_material_rgba_16_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_advect_material_rgba_16_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_advect_material_rgba_8_glsl/sh_fd_advect_material_rgba_8_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_advect_material_rgba_8_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_advect_velocity_0_glsl/sh_fd_advect_velocity_0_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_advect_velocity_0_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_advect_velocity_1_glsl/sh_fd_advect_velocity_1_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_advect_velocity_1_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_calculate_pressure_jacobi_glsl/sh_fd_calculate_pressure_jacobi_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_calculate_pressure_jacobi_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_calculate_pressure_srj_glsl/sh_fd_calculate_pressure_srj_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_calculate_pressure_srj_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_calculate_velocity_divergence_glsl/sh_fd_calculate_velocity_divergence_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_calculate_velocity_divergence_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_replace_material_advanced_glsl/sh_fd_replace_material_advanced_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_replace_material_advanced_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_repulse/sh_fd_repulse.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_repulse",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_subtract_pressure_gradient_glsl/sh_fd_subtract_pressure_gradient_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_subtract_pressure_gradient_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_turbulence/sh_fd_turbulence.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_turbulence",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_velocity_combine/sh_fd_velocity_combine.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_velocity_combine",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_visualize_colorize_glsl/sh_fd_visualize_colorize_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_visualize_colorize_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_visualize_pixel_art_fiery_smoke_glsl/sh_fd_visualize_pixel_art_fiery_smoke_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_visualize_pixel_art_fiery_smoke_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_visualize_pixel_art_fire_glsl/sh_fd_visualize_pixel_art_fire_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_visualize_pixel_art_fire_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_visualize_pressure_glsl/sh_fd_visualize_pressure_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_visualize_pressure_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_visualize_thick_smoke_glsl/sh_fd_visualize_thick_smoke_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_visualize_thick_smoke_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_visualize_velocity_divergence_glsl/sh_fd_visualize_velocity_divergence_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_visualize_velocity_divergence_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_visualize_velocity_glsl/sh_fd_visualize_velocity_glsl.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_visualize_velocity_glsl",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_fd_vortex/sh_fd_vortex.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_fd_vortex",
+  "type": 1,
   "parent": {
     "name": "Shaders",
     "path": "folders/functions/fluid sim/Shaders.yy",
   },
-  "type": 1,
 }

shaders/sh_find_pixel/sh_find_pixel.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_find_pixel",
+  "type": 1,
   "parent": {
     "name": "shader",
     "path": "folders/shader.yy",
   },
-  "type": 1,
 }

shaders/sh_flip/sh_flip.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_flip",
+  "type": 1,
   "parent": {
     "name": "warp",
     "path": "folders/shader/warp.yy",
   },
-  "type": 1,
 }

shaders/sh_glow/sh_glow.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_glow",
+  "type": 1,
   "parent": {
     "name": "filter",
     "path": "folders/shader/filter.yy",
   },
-  "type": 1,
 }

shaders/sh_gradient/sh_gradient.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_gradient",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }

shaders/sh_gradient_display/sh_gradient_display.yy

@@ -2,9 +2,9 @@
   "resourceType": "GMShader",
   "resourceVersion": "1.0",
   "name": "sh_gradient_display",
+  "type": 1,
   "parent": {
     "name": "generator",
     "path": "folders/shader/generator.yy",
   },
-  "type": 1,
 }