diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order
index ac9f988c2..6c0b27602 100644
--- a/PixelComposer.resource_order
+++ b/PixelComposer.resource_order
@@ -226,6 +226,7 @@
{"name":"fd_rectangle_get_material_dissipation_type","order":8,"path":"scripts/fd_rectangle_get_material_dissipation_type/fd_rectangle_get_material_dissipation_type.yy",},
{"name":"draw_surface_blend","order":1,"path":"scripts/draw_surface_blend/draw_surface_blend.yy",},
{"name":"node_string_get_char","order":19,"path":"scripts/node_string_get_char/node_string_get_char.yy",},
+ {"name":"draw_line_elbow","order":17,"path":"scripts/draw_line_elbow/draw_line_elbow.yy",},
{"name":"node_path_reverse","order":29,"path":"scripts/node_path_reverse/node_path_reverse.yy",},
{"name":"fd_rectangle_get_acceleration_y","order":3,"path":"scripts/fd_rectangle_get_acceleration_y/fd_rectangle_get_acceleration_y.yy",},
{"name":"sh_simplex","order":22,"path":"shaders/sh_simplex/sh_simplex.yy",},
@@ -244,6 +245,7 @@
{"name":"fd_rectangle_create_view","order":3,"path":"scripts/fd_rectangle_create_view/fd_rectangle_create_view.yy",},
{"name":"node_fluid_vortex","order":8,"path":"scripts/node_fluid_vortex/node_fluid_vortex.yy",},
{"name":"sh_cell_noise_round","order":9,"path":"shaders/sh_cell_noise_round/sh_cell_noise_round.yy",},
+ {"name":"json_functions","order":8,"path":"scripts/json_functions/json_functions.yy",},
{"name":"event_recorder","order":3,"path":"scripts/event_recorder/event_recorder.yy",},
{"name":"s_node_noise_cell","order":10,"path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},
{"name":"node_colorize","order":4,"path":"scripts/node_colorize/node_colorize.yy",},
@@ -415,6 +417,7 @@
{"name":"node_display_image","order":4,"path":"scripts/node_display_image/node_display_image.yy",},
{"name":"node_rigid_global","order":5,"path":"scripts/node_rigid_global/node_rigid_global.yy",},
{"name":"node_chromatic_aberration","order":4,"path":"scripts/node_chromatic_aberration/node_chromatic_aberration.yy",},
+ {"name":"draw_line_elbow_diag","order":18,"path":"scripts/draw_line_elbow_diag/draw_line_elbow_diag.yy",},
{"name":"node_pin","order":2,"path":"scripts/node_pin/node_pin.yy",},
{"name":"_node_fluid_nodes","order":7,"path":"scripts/_node_fluid_nodes/_node_fluid_nodes.yy",},
{"name":"sh_noise","order":16,"path":"shaders/sh_noise/sh_noise.yy",},
@@ -554,6 +557,7 @@
{"name":"node_noise_grid_hex","order":24,"path":"scripts/node_noise_grid_hex/node_noise_grid_hex.yy",},
{"name":"node_lua_global","order":1,"path":"scripts/node_lua_global/node_lua_global.yy",},
{"name":"o_dialog_preset","order":1,"path":"objects/o_dialog_preset/o_dialog_preset.yy",},
+ {"name":"o_dialog_tunnels","order":6,"path":"objects/o_dialog_tunnels/o_dialog_tunnels.yy",},
{"name":"s_node_erode","order":21,"path":"sprites/s_node_erode/s_node_erode.yy",},
{"name":"node_particle","order":14,"path":"scripts/node_particle/node_particle.yy",},
{"name":"level_histogram","order":1,"path":"scripts/level_histogram/level_histogram.yy",},
@@ -580,6 +584,7 @@
{"name":"node_ase_file_read","order":14,"path":"scripts/node_ase_file_read/node_ase_file_read.yy",},
{"name":"sh_seperate_shape_counter","order":1,"path":"shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.yy",},
{"name":"s_node_stack","order":35,"path":"sprites/s_node_stack/s_node_stack.yy",},
+ {"name":"s_fade_up","order":3,"path":"sprites/s_fade_up/s_fade_up.yy",},
{"name":"node_guide","order":18,"path":"scripts/node_guide/node_guide.yy",},
{"name":"fd_rectangle_get_velocity_surface","order":24,"path":"scripts/fd_rectangle_get_velocity_surface/fd_rectangle_get_velocity_surface.yy",},
{"name":"s_node_text_char_get","order":2,"path":"sprites/s_node_text_char_get/s_node_text_char_get.yy",},
@@ -649,6 +654,7 @@
{"name":"s_node_fluidSim_vortex","order":8,"path":"sprites/s_node_fluidSim_vortex/s_node_fluidSim_vortex.yy",},
{"name":"string_hexadecimal","order":1,"path":"scripts/string_hexadecimal/string_hexadecimal.yy",},
{"name":"s_node_camera","order":3,"path":"sprites/s_node_camera/s_node_camera.yy",},
+ {"name":"sh_find_boundary","order":48,"path":"shaders/sh_find_boundary/sh_find_boundary.yy",},
{"name":"sh_vertex_pnt_light","order":4,"path":"shaders/sh_vertex_pnt_light/sh_vertex_pnt_light.yy",},
{"name":"surfaceBox","order":22,"path":"scripts/surfaceBox/surfaceBox.yy",},
{"name":"node_gradient_palette","order":11,"path":"scripts/node_gradient_palette/node_gradient_palette.yy",},
@@ -673,6 +679,8 @@
{"name":"sh_erode","order":17,"path":"shaders/sh_erode/sh_erode.yy",},
{"name":"fd_rectangle_get_velocity_dissipation_value","order":21,"path":"scripts/fd_rectangle_get_velocity_dissipation_value/fd_rectangle_get_velocity_dissipation_value.yy",},
{"name":"node_pixel_cloud","order":15,"path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",},
+ {"name":"s_node_crop_content","order":13,"path":"sprites/s_node_crop_content/s_node_crop_content.yy",},
+ {"name":"draw_line_zigzag","order":20,"path":"scripts/draw_line_zigzag/draw_line_zigzag.yy",},
{"name":"sh_alpha_grey","order":13,"path":"shaders/sh_alpha_grey/sh_alpha_grey.yy",},
{"name":"s_node_rigidSim_activate","order":6,"path":"sprites/s_node_rigidSim_activate/s_node_rigidSim_activate.yy",},
{"name":"s_transparent","order":1,"path":"sprites/s_transparent/s_transparent.yy",},
@@ -723,6 +731,7 @@
{"name":"fd_rectangle_set_velocity_maccormack_weight","order":15,"path":"scripts/fd_rectangle_set_velocity_maccormack_weight/fd_rectangle_set_velocity_maccormack_weight.yy",},
{"name":"s_node_array_sort","order":11,"path":"sprites/s_node_array_sort/s_node_array_sort.yy",},
{"name":"node_trail","order":16,"path":"scripts/node_trail/node_trail.yy",},
+ {"name":"json_prettify","order":7,"path":"scripts/json_prettify/json_prettify.yy",},
{"name":"s_node_loop_output","order":13,"path":"sprites/s_node_loop_output/s_node_loop_output.yy",},
{"name":"render_data","order":2,"path":"scripts/render_data/render_data.yy",},
{"name":"o_dialog_graph_view","order":4,"path":"objects/o_dialog_graph_view/o_dialog_graph_view.yy",},
@@ -845,6 +854,7 @@
{"name":"s_node_path_blend","order":1,"path":"sprites/s_node_path_blend/s_node_path_blend.yy",},
{"name":"s_node_3d_extrude","order":2,"path":"sprites/s_node_3d_extrude/s_node_3d_extrude.yy",},
{"name":"buttonGradient","order":4,"path":"scripts/buttonGradient/buttonGradient.yy",},
+ {"name":"sh_draw_downsample","order":2,"path":"shaders/sh_draw_downsample/sh_draw_downsample.yy",},
{"name":"__view_get","order":1,"path":"scripts/__view_get/__view_get.yy",},
{"name":"s_node_texture_map","order":36,"path":"sprites/s_node_texture_map/s_node_texture_map.yy",},
{"name":"fd_rectangle_create","order":7,"path":"scripts/fd_rectangle_create/fd_rectangle_create.yy",},
@@ -873,6 +883,7 @@
{"name":"s_node_canvas","order":3,"path":"sprites/s_node_canvas/s_node_canvas.yy",},
{"name":"sh_remove_black","order":33,"path":"shaders/sh_remove_black/sh_remove_black.yy",},
{"name":"path_parser","order":3,"path":"scripts/path_parser/path_parser.yy",},
+ {"name":"node_crop_content","order":14,"path":"scripts/node_crop_content/node_crop_content.yy",},
{"name":"s_node_unicode","order":8,"path":"sprites/s_node_unicode/s_node_unicode.yy",},
{"name":"s_node_color_from_hsv","order":4,"path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},
{"name":"fd_rectangle_get_material_type","order":14,"path":"scripts/fd_rectangle_get_material_type/fd_rectangle_get_material_type.yy",},
@@ -968,6 +979,7 @@
{"name":"sh_sdf_dist","order":4,"path":"shaders/sh_sdf_dist/sh_sdf_dist.yy",},
{"name":"sh_de_corner","order":15,"path":"shaders/sh_de_corner/sh_de_corner.yy",},
{"name":"node_rigid_object_spawner","order":6,"path":"scripts/node_rigid_object_spawner/node_rigid_object_spawner.yy",},
+ {"name":"o_dialog_graph_connection","order":5,"path":"objects/o_dialog_graph_connection/o_dialog_graph_connection.yy",},
{"name":"file_dropper","order":1,"path":"extensions/file_dropper/file_dropper.yy",},
{"name":"sh_fd_advect_velocity_0_glsl","order":6,"path":"shaders/sh_fd_advect_velocity_0_glsl/sh_fd_advect_velocity_0_glsl.yy",},
{"name":"sh_flood_fill_replace","order":2,"path":"shaders/sh_flood_fill_replace/sh_flood_fill_replace.yy",},
@@ -991,6 +1003,7 @@
{"name":"node_alpha_to_grey","order":3,"path":"scripts/node_alpha_to_grey/node_alpha_to_grey.yy",},
{"name":"shell_helper","order":20,"path":"scripts/shell_helper/shell_helper.yy",},
{"name":"sh_flood_fill_it","order":1,"path":"shaders/sh_flood_fill_it/sh_flood_fill_it.yy",},
+ {"name":"draw_corner","order":19,"path":"scripts/draw_corner/draw_corner.yy",},
{"name":"o_dialog_preference","order":7,"path":"objects/o_dialog_preference/o_dialog_preference.yy",},
{"name":"node_wrap","order":2,"path":"scripts/node_wrap/node_wrap.yy",},
{"name":"node_3d_prim_sphere","order":13,"path":"scripts/node_3d_prim_sphere/node_3d_prim_sphere.yy",},
diff --git a/PixelComposer.yyp b/PixelComposer.yyp
index 7802698b6..d3e88f473 100644
--- a/PixelComposer.yyp
+++ b/PixelComposer.yyp
@@ -216,7 +216,7 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_accept_32.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_array_processor.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_center_canvas.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
- {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_curve_connection_strip3.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_curve_connection.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_grid_setting.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_grid_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_minimap_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
@@ -226,6 +226,7 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_revert.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_save.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_spalsh_show_on_start_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_splash_thumbnail.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_split_view_strip3.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_tile_view_strip4.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_icon_visibility.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
@@ -239,6 +240,8 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_minus_24.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_name.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_new.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_goto.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_move.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_processor.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_resize.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_noti_icon_error_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/icon",},
@@ -318,6 +321,7 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_draw_area.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_draw_path.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_frame_bg.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_frame_title.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_glow.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_junction_name_bg.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_junctions_array_hover.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
@@ -328,6 +332,13 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_pin_active.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_pin.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_state_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"graphic.ai","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node/widget",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_checkbox_strip4.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node/widget",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_coor_pin.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node/widget",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_rotator_bg.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node/widget",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_rotator_knob_strip2.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node/widget",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_node_slider.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/node/widget",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"fade_up.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/others",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"graphic.ai","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/others",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_key_display_mouse_strip6.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/others",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"anchor_arrow.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/preview",},
@@ -403,6 +414,7 @@
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_textbox_code_line.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/widget",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_textbox_strip4.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/widget",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"s_widget_highlight.png","CopyToMask":-1,"filePath":"datafiles/data/themes/default/graphics/widget",},
+ {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"tooltip.zip","CopyToMask":-1,"filePath":"datafiles/data",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"0 introduction.png","CopyToMask":-1,"filePath":"datafiles/Getting started",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"0 introduction.pxc","CopyToMask":-1,"filePath":"datafiles/Getting started",},
{"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"1 image import.png","CopyToMask":-1,"filePath":"datafiles/Getting started",},
@@ -593,6 +605,7 @@
{"id":{"name":"draw_surface_blend","path":"scripts/draw_surface_blend/draw_surface_blend.yy",},"order":1,},
{"id":{"name":"node_string_get_char","path":"scripts/node_string_get_char/node_string_get_char.yy",},"order":19,},
{"id":{"name":"_p_dialog_undo_block","path":"objects/_p_dialog_undo_block/_p_dialog_undo_block.yy",},"order":0,},
+ {"id":{"name":"draw_line_elbow","path":"scripts/draw_line_elbow/draw_line_elbow.yy",},"order":17,},
{"id":{"name":"node_path_reverse","path":"scripts/node_path_reverse/node_path_reverse.yy",},"order":29,},
{"id":{"name":"fd_rectangle_get_acceleration_y","path":"scripts/fd_rectangle_get_acceleration_y/fd_rectangle_get_acceleration_y.yy",},"order":3,},
{"id":{"name":"sh_simplex","path":"shaders/sh_simplex/sh_simplex.yy",},"order":22,},
@@ -613,6 +626,7 @@
{"id":{"name":"fd_rectangle_create_view","path":"scripts/fd_rectangle_create_view/fd_rectangle_create_view.yy",},"order":3,},
{"id":{"name":"node_fluid_vortex","path":"scripts/node_fluid_vortex/node_fluid_vortex.yy",},"order":8,},
{"id":{"name":"sh_cell_noise_round","path":"shaders/sh_cell_noise_round/sh_cell_noise_round.yy",},"order":9,},
+ {"id":{"name":"json_functions","path":"scripts/json_functions/json_functions.yy",},"order":8,},
{"id":{"name":"event_recorder","path":"scripts/event_recorder/event_recorder.yy",},"order":3,},
{"id":{"name":"s_node_noise_cell","path":"sprites/s_node_noise_cell/s_node_noise_cell.yy",},"order":10,},
{"id":{"name":"node_colorize","path":"scripts/node_colorize/node_colorize.yy",},"order":4,},
@@ -810,6 +824,7 @@
{"id":{"name":"node_display_image","path":"scripts/node_display_image/node_display_image.yy",},"order":4,},
{"id":{"name":"node_rigid_global","path":"scripts/node_rigid_global/node_rigid_global.yy",},"order":5,},
{"id":{"name":"node_chromatic_aberration","path":"scripts/node_chromatic_aberration/node_chromatic_aberration.yy",},"order":4,},
+ {"id":{"name":"draw_line_elbow_diag","path":"scripts/draw_line_elbow_diag/draw_line_elbow_diag.yy",},"order":18,},
{"id":{"name":"node_pin","path":"scripts/node_pin/node_pin.yy",},"order":2,},
{"id":{"name":"_node_fluid_nodes","path":"scripts/_node_fluid_nodes/_node_fluid_nodes.yy",},"order":7,},
{"id":{"name":"sh_noise","path":"shaders/sh_noise/sh_noise.yy",},"order":16,},
@@ -968,6 +983,7 @@
{"id":{"name":"node_noise_grid_hex","path":"scripts/node_noise_grid_hex/node_noise_grid_hex.yy",},"order":24,},
{"id":{"name":"node_lua_global","path":"scripts/node_lua_global/node_lua_global.yy",},"order":1,},
{"id":{"name":"o_dialog_preset","path":"objects/o_dialog_preset/o_dialog_preset.yy",},"order":1,},
+ {"id":{"name":"o_dialog_tunnels","path":"objects/o_dialog_tunnels/o_dialog_tunnels.yy",},"order":6,},
{"id":{"name":"s_node_erode","path":"sprites/s_node_erode/s_node_erode.yy",},"order":21,},
{"id":{"name":"node_particle","path":"scripts/node_particle/node_particle.yy",},"order":14,},
{"id":{"name":"level_histogram","path":"scripts/level_histogram/level_histogram.yy",},"order":1,},
@@ -996,6 +1012,7 @@
{"id":{"name":"s_workshop_frame","path":"sprites/s_workshop_frame/s_workshop_frame.yy",},"order":0,},
{"id":{"name":"sh_seperate_shape_counter","path":"shaders/sh_seperate_shape_counter/sh_seperate_shape_counter.yy",},"order":1,},
{"id":{"name":"s_node_stack","path":"sprites/s_node_stack/s_node_stack.yy",},"order":35,},
+ {"id":{"name":"s_fade_up","path":"sprites/s_fade_up/s_fade_up.yy",},"order":3,},
{"id":{"name":"node_guide","path":"scripts/node_guide/node_guide.yy",},"order":18,},
{"id":{"name":"fd_rectangle_get_velocity_surface","path":"scripts/fd_rectangle_get_velocity_surface/fd_rectangle_get_velocity_surface.yy",},"order":24,},
{"id":{"name":"s_node_text_char_get","path":"sprites/s_node_text_char_get/s_node_text_char_get.yy",},"order":2,},
@@ -1070,6 +1087,7 @@
{"id":{"name":"s_node_fluidSim_vortex","path":"sprites/s_node_fluidSim_vortex/s_node_fluidSim_vortex.yy",},"order":8,},
{"id":{"name":"string_hexadecimal","path":"scripts/string_hexadecimal/string_hexadecimal.yy",},"order":1,},
{"id":{"name":"s_node_camera","path":"sprites/s_node_camera/s_node_camera.yy",},"order":3,},
+ {"id":{"name":"sh_find_boundary","path":"shaders/sh_find_boundary/sh_find_boundary.yy",},"order":48,},
{"id":{"name":"sh_vertex_pnt_light","path":"shaders/sh_vertex_pnt_light/sh_vertex_pnt_light.yy",},"order":4,},
{"id":{"name":"surfaceBox","path":"scripts/surfaceBox/surfaceBox.yy",},"order":22,},
{"id":{"name":"node_gradient_palette","path":"scripts/node_gradient_palette/node_gradient_palette.yy",},"order":11,},
@@ -1097,6 +1115,8 @@
{"id":{"name":"sh_erode","path":"shaders/sh_erode/sh_erode.yy",},"order":17,},
{"id":{"name":"fd_rectangle_get_velocity_dissipation_value","path":"scripts/fd_rectangle_get_velocity_dissipation_value/fd_rectangle_get_velocity_dissipation_value.yy",},"order":21,},
{"id":{"name":"node_pixel_cloud","path":"scripts/node_pixel_cloud/node_pixel_cloud.yy",},"order":15,},
+ {"id":{"name":"s_node_crop_content","path":"sprites/s_node_crop_content/s_node_crop_content.yy",},"order":13,},
+ {"id":{"name":"draw_line_zigzag","path":"scripts/draw_line_zigzag/draw_line_zigzag.yy",},"order":20,},
{"id":{"name":"sh_alpha_grey","path":"shaders/sh_alpha_grey/sh_alpha_grey.yy",},"order":13,},
{"id":{"name":"s_node_rigidSim_activate","path":"sprites/s_node_rigidSim_activate/s_node_rigidSim_activate.yy",},"order":6,},
{"id":{"name":"s_transparent","path":"sprites/s_transparent/s_transparent.yy",},"order":1,},
@@ -1151,6 +1171,7 @@
{"id":{"name":"s_node_array_sort","path":"sprites/s_node_array_sort/s_node_array_sort.yy",},"order":11,},
{"id":{"name":"node_trail","path":"scripts/node_trail/node_trail.yy",},"order":16,},
{"id":{"name":"byte_reader","path":"scripts/byte_reader/byte_reader.yy",},"order":0,},
+ {"id":{"name":"json_prettify","path":"scripts/json_prettify/json_prettify.yy",},"order":7,},
{"id":{"name":"s_node_loop_output","path":"sprites/s_node_loop_output/s_node_loop_output.yy",},"order":13,},
{"id":{"name":"_p_dialog","path":"objects/_p_dialog/_p_dialog.yy",},"order":0,},
{"id":{"name":"render_data","path":"scripts/render_data/render_data.yy",},"order":2,},
@@ -1302,6 +1323,7 @@
{"id":{"name":"preview_overlay_scalar","path":"scripts/preview_overlay_scalar/preview_overlay_scalar.yy",},"order":0,},
{"id":{"name":"s_node_3d_extrude","path":"sprites/s_node_3d_extrude/s_node_3d_extrude.yy",},"order":2,},
{"id":{"name":"buttonGradient","path":"scripts/buttonGradient/buttonGradient.yy",},"order":4,},
+ {"id":{"name":"sh_draw_downsample","path":"shaders/sh_draw_downsample/sh_draw_downsample.yy",},"order":2,},
{"id":{"name":"__view_get","path":"scripts/__view_get/__view_get.yy",},"order":1,},
{"id":{"name":"s_node_texture_map","path":"sprites/s_node_texture_map/s_node_texture_map.yy",},"order":36,},
{"id":{"name":"fd_rectangle_create","path":"scripts/fd_rectangle_create/fd_rectangle_create.yy",},"order":7,},
@@ -1332,6 +1354,7 @@
{"id":{"name":"s_node_canvas","path":"sprites/s_node_canvas/s_node_canvas.yy",},"order":3,},
{"id":{"name":"sh_remove_black","path":"shaders/sh_remove_black/sh_remove_black.yy",},"order":33,},
{"id":{"name":"path_parser","path":"scripts/path_parser/path_parser.yy",},"order":3,},
+ {"id":{"name":"node_crop_content","path":"scripts/node_crop_content/node_crop_content.yy",},"order":14,},
{"id":{"name":"s_node_unicode","path":"sprites/s_node_unicode/s_node_unicode.yy",},"order":8,},
{"id":{"name":"s_node_color_from_hsv","path":"sprites/s_node_color_from_hsv/s_node_color_from_hsv.yy",},"order":4,},
{"id":{"name":"fd_rectangle_get_material_type","path":"scripts/fd_rectangle_get_material_type/fd_rectangle_get_material_type.yy",},"order":14,},
@@ -1442,6 +1465,7 @@
{"id":{"name":"node_bw","path":"scripts/node_bw/node_bw.yy",},"order":0,},
{"id":{"name":"sh_de_corner","path":"shaders/sh_de_corner/sh_de_corner.yy",},"order":15,},
{"id":{"name":"node_rigid_object_spawner","path":"scripts/node_rigid_object_spawner/node_rigid_object_spawner.yy",},"order":6,},
+ {"id":{"name":"o_dialog_graph_connection","path":"objects/o_dialog_graph_connection/o_dialog_graph_connection.yy",},"order":5,},
{"id":{"name":"file_dropper","path":"extensions/file_dropper/file_dropper.yy",},"order":1,},
{"id":{"name":"sh_fd_advect_velocity_0_glsl","path":"shaders/sh_fd_advect_velocity_0_glsl/sh_fd_advect_velocity_0_glsl.yy",},"order":6,},
{"id":{"name":"sh_flood_fill_replace","path":"shaders/sh_flood_fill_replace/sh_flood_fill_replace.yy",},"order":2,},
@@ -1471,6 +1495,7 @@
{"id":{"name":"node_alpha_to_grey","path":"scripts/node_alpha_to_grey/node_alpha_to_grey.yy",},"order":3,},
{"id":{"name":"shell_helper","path":"scripts/shell_helper/shell_helper.yy",},"order":20,},
{"id":{"name":"sh_flood_fill_it","path":"shaders/sh_flood_fill_it/sh_flood_fill_it.yy",},"order":1,},
+ {"id":{"name":"draw_corner","path":"scripts/draw_corner/draw_corner.yy",},"order":19,},
{"id":{"name":"o_dialog_preference","path":"objects/o_dialog_preference/o_dialog_preference.yy",},"order":7,},
{"id":{"name":"node_wrap","path":"scripts/node_wrap/node_wrap.yy",},"order":2,},
{"id":{"name":"node_3d_prim_sphere","path":"scripts/node_3d_prim_sphere/node_3d_prim_sphere.yy",},"order":13,},
diff --git a/datafiles/data/themes/default.zip b/datafiles/data/themes/default.zip
index 1abdee268..0731673a5 100644
Binary files a/datafiles/data/themes/default.zip and b/datafiles/data/themes/default.zip differ
diff --git a/datafiles/data/themes/default/graphics/graphics.json b/datafiles/data/themes/default/graphics/graphics.json
index 65d87a215..522211088 100644
--- a/datafiles/data/themes/default/graphics/graphics.json
+++ b/datafiles/data/themes/default/graphics/graphics.json
@@ -626,6 +626,223 @@
"yorigin": 24,
"slice": null
},
+ "node_resize": {
+ "path": "./icon/s_node_resize.png",
+ "subimages": 1,
+ "xorigin": 32,
+ "yorigin": 32,
+ "slice": null
+ },
+ "icon_curve_connection": {
+ "path": "./icon/s_icon_curve_connection.png",
+ "subimages": 4,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "node_output_visible": {
+ "path": "./icon/s_icon_output_visibility.png",
+ "subimages": 1,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_minimap": {
+ "path": "./icon/s_icon_minimap_strip2.png",
+ "subimages": 2,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "noti_icon_tick": {
+ "path": "./icon/s_noti_icon_tick.png",
+ "subimages": 1,
+ "xorigin": 20,
+ "yorigin": 20,
+ "slice": null
+ },
+ "noti_icon_error": {
+ "path": "./icon/s_noti_icon_error_strip2.png",
+ "subimages": 2,
+ "xorigin": 20,
+ "yorigin": 20,
+ "slice": null
+ },
+ "noti_icon_warning": {
+ "path": "./icon/s_noti_icon_warning_strip2.png",
+ "subimages": 2,
+ "xorigin": 20,
+ "yorigin": 20,
+ "slice": null
+ },
+ "noti_icon_log": {
+ "path": "./icon/s_noti_icon_log_strip2.png",
+ "subimages": 2,
+ "xorigin": 20,
+ "yorigin": 20,
+ "slice": null
+ },
+ "noti_icon_file_load": {
+ "path": "./icon/s_noti_icon_file_load.png",
+ "subimages": 1,
+ "xorigin": 20,
+ "yorigin": 20,
+ "slice": null
+ },
+ "noti_icon_file_save": {
+ "path": "./icon/s_noti_icon_file_save.png",
+ "subimages": 1,
+ "xorigin": 20,
+ "yorigin": 20,
+ "slice": null
+ },
+ "icon_center_canvas": {
+ "path": "./icon/s_icon_center_canvas.png",
+ "subimages": 1,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_grid": {
+ "path": "./icon/s_icon_grid_strip2.png",
+ "subimages": 2,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_grid_setting": {
+ "path": "./icon/s_icon_grid_setting.png",
+ "subimages": 1,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_preview_export": {
+ "path": "./icon/s_icon_preview_export.png",
+ "subimages": 1,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_reset_when_preview": {
+ "path": "./icon/s_icon_reset_when_preview_strip2.png",
+ "subimages": 2,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_split_view": {
+ "path": "./icon/s_icon_split_view_strip3.png",
+ "subimages": 3,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_tile_view": {
+ "path": "./icon/s_icon_tile_view_strip4.png",
+ "subimages": 4,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_active_split": {
+ "path": "./icon/s_panel_active_split.png",
+ "subimages": 1,
+ "xorigin": 12,
+ "yorigin": 12,
+ "slice": null
+ },
+ "revert": {
+ "path": "./icon/s_icon_revert.png",
+ "subimages": 1,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "save": {
+ "path": "./icon/s_icon_save.png",
+ "subimages": 1,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "window_exit": {
+ "path": "./icon/s_window_exit.png",
+ "subimages": 1,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "window_minimize": {
+ "path": "./icon/s_window_minimize.png",
+ "subimages": 1,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "window_maximize": {
+ "path": "./icon/s_window_maximize.png",
+ "subimages": 2,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "window_fullscreen": {
+ "path": "./icon/s_window_fullscreen.png",
+ "subimages": 2,
+ "xorigin": 16,
+ "yorigin": 16,
+ "slice": null
+ },
+ "icon_splash_show_on_start": {
+ "path": "./icon/s_icon_spalsh_show_on_start_strip2.png",
+ "subimages": 2,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "icon_array_processor": {
+ "path": "./icon/s_icon_array_processor.png",
+ "subimages": 4,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "tunnel": {
+ "path": "./icon/s_tunnel.png",
+ "subimages": 2,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "lock": {
+ "path": "./icon/s_lock.png",
+ "subimages": 2,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "node_move": {
+ "path": "./icon/s_node_move.png",
+ "subimages": 1,
+ "xorigin": 0,
+ "yorigin": 0,
+ "slice": null
+ },
+ "splash_thumbnail": {
+ "path": "./icon/s_icon_splash_thumbnail.png",
+ "subimages": 2,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
+ "node_goto": {
+ "path": "./icon/s_node_goto.png",
+ "subimages": 1,
+ "xorigin": 24,
+ "yorigin": 24,
+ "slice": null
+ },
"inspector_area": {
"path": "./inspector/s_inspector_area_strip2.png",
"subimages": 2,
@@ -878,6 +1095,19 @@
"bottom": 7
}
},
+ "node_frame_title": {
+ "path": "./node/s_node_frame_title.png",
+ "subimages": 1,
+ "xorigin": 0,
+ "yorigin": 0,
+ "slice": {
+ "enabled": true,
+ "left": 7,
+ "right": 7,
+ "top": 7,
+ "bottom": 7
+ }
+ },
"node_junction_name_bg": {
"path": "./node/s_node_junction_name_bg.png",
"subimages": 1,
@@ -891,13 +1121,6 @@
"bottom": 15
}
},
- "node_resize": {
- "path": "./icon/s_node_resize.png",
- "subimages": 1,
- "xorigin": 32,
- "yorigin": 32,
- "slice": null
- },
"node_state": {
"path": "./node/s_node_state_strip2.png",
"subimages": 2,
@@ -905,25 +1128,51 @@
"yorigin": 12,
"slice": null
},
- "icon_curve_connection": {
- "path": "./icon/s_icon_curve_connection_strip3.png",
- "subimages": 3,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
+ "node_slider": {
+ "path": "./node/widget/s_node_slider.png",
+ "subimages": 5,
+ "xorigin": 0,
+ "yorigin": 0,
+ "slice": {
+ "enabled": true,
+ "left": 4,
+ "right": 4,
+ "top": 4,
+ "bottom": 4
+ }
},
- "node_output_visible": {
- "path": "./icon/s_icon_output_visibility.png",
+ "node_rotator_bg": {
+ "path": "./node/widget/s_node_rotator_bg.png",
"subimages": 1,
- "xorigin": 24,
- "yorigin": 24,
+ "xorigin": 80,
+ "yorigin": 80,
"slice": null
},
- "icon_minimap": {
- "path": "./icon/s_icon_minimap_strip2.png",
+ "node_rotator_knob": {
+ "path": "./node/widget/s_node_rotator_knob_strip2.png",
"subimages": 2,
- "xorigin": 24,
- "yorigin": 24,
+ "xorigin": 20,
+ "yorigin": 20,
+ "slice": null
+ },
+ "node_checkbox": {
+ "path": "./node/widget/s_node_checkbox_strip4.png",
+ "subimages": 4,
+ "xorigin": 0,
+ "yorigin": 0,
+ "slice": {
+ "enabled": true,
+ "left": 7,
+ "right": 7,
+ "top": 7,
+ "bottom": 7
+ }
+ },
+ "node_coor_pin": {
+ "path": "./node/widget/s_node_coor_pin.png",
+ "subimages": 1,
+ "xorigin": 6,
+ "yorigin": 6,
"slice": null
},
"menu_separator": {
@@ -939,174 +1188,6 @@
"bottom": 0
}
},
- "noti_icon_tick": {
- "path": "./icon/s_noti_icon_tick.png",
- "subimages": 1,
- "xorigin": 20,
- "yorigin": 20,
- "slice": null
- },
- "noti_icon_error": {
- "path": "./icon/s_noti_icon_error_strip2.png",
- "subimages": 2,
- "xorigin": 20,
- "yorigin": 20,
- "slice": null
- },
- "noti_icon_warning": {
- "path": "./icon/s_noti_icon_warning_strip2.png",
- "subimages": 2,
- "xorigin": 20,
- "yorigin": 20,
- "slice": null
- },
- "noti_icon_log": {
- "path": "./icon/s_noti_icon_log_strip2.png",
- "subimages": 2,
- "xorigin": 20,
- "yorigin": 20,
- "slice": null
- },
- "noti_icon_file_load": {
- "path": "./icon/s_noti_icon_file_load.png",
- "subimages": 1,
- "xorigin": 20,
- "yorigin": 20,
- "slice": null
- },
- "noti_icon_file_save": {
- "path": "./icon/s_noti_icon_file_save.png",
- "subimages": 1,
- "xorigin": 20,
- "yorigin": 20,
- "slice": null
- },
- "icon_center_canvas": {
- "path": "./icon/s_icon_center_canvas.png",
- "subimages": 1,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_grid": {
- "path": "./icon/s_icon_grid_strip2.png",
- "subimages": 2,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_grid_setting": {
- "path": "./icon/s_icon_grid_setting.png",
- "subimages": 1,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_preview_export": {
- "path": "./icon/s_icon_preview_export.png",
- "subimages": 1,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_reset_when_preview": {
- "path": "./icon/s_icon_reset_when_preview_strip2.png",
- "subimages": 2,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_split_view": {
- "path": "./icon/s_icon_split_view_strip3.png",
- "subimages": 3,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_tile_view": {
- "path": "./icon/s_icon_tile_view_strip4.png",
- "subimages": 4,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_active_split": {
- "path": "./icon/s_panel_active_split.png",
- "subimages": 1,
- "xorigin": 12,
- "yorigin": 12,
- "slice": null
- },
- "revert": {
- "path": "./icon/s_icon_revert.png",
- "subimages": 1,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "save": {
- "path": "./icon/s_icon_save.png",
- "subimages": 1,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "window_exit": {
- "path": "./icon/s_window_exit.png",
- "subimages": 1,
- "xorigin": 16,
- "yorigin": 16,
- "slice": null
- },
- "window_minimize": {
- "path": "./icon/s_window_minimize.png",
- "subimages": 1,
- "xorigin": 16,
- "yorigin": 16,
- "slice": null
- },
- "window_maximize": {
- "path": "./icon/s_window_maximize.png",
- "subimages": 2,
- "xorigin": 16,
- "yorigin": 16,
- "slice": null
- },
- "window_fullscreen": {
- "path": "./icon/s_window_fullscreen.png",
- "subimages": 2,
- "xorigin": 16,
- "yorigin": 16,
- "slice": null
- },
- "icon_splash_show_on_start": {
- "path": "./icon/s_icon_spalsh_show_on_start_strip2.png",
- "subimages": 2,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "icon_array_processor": {
- "path": "./icon/s_icon_array_processor.png",
- "subimages": 4,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "tunnel": {
- "path": "./icon/s_tunnel.png",
- "subimages": 2,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
- "lock": {
- "path": "./icon/s_lock.png",
- "subimages": 2,
- "xorigin": 24,
- "yorigin": 24,
- "slice": null
- },
"menu_button": {
"path": "./UI/s_menu_button.png",
"subimages": 1,
diff --git a/datafiles/data/themes/default/graphics/icon/graphics x2.ai b/datafiles/data/themes/default/graphics/icon/graphics x2.ai
index 2dbde0fe1..86fe47084 100644
--- a/datafiles/data/themes/default/graphics/icon/graphics x2.ai
+++ b/datafiles/data/themes/default/graphics/icon/graphics x2.ai
@@ -24,8 +24,8 @@
Adobe Illustrator 27.0 (Windows)
2022-11-26T09:16:08+07:00
- 2023-03-02T13:46:34+07:00
- 2023-03-02T13:46:34+07:00
+ 2023-03-05T12:04:42+07:00
+ 2023-03-05T12:04:42+07:00
@@ -39,7 +39,7 @@
default
uuid:65E6390686CF11DBA6E2D887CEACB407
xmp.did:7647d1b0-ea83-ca49-b85e-bbc9513ca4bb
- uuid:13fb6df9-2b6d-4c33-a873-a455036a81a8
+ uuid:558f185e-d878-43da-83c0-afd06dad7de1
uuid:673f9e21-4d80-48ad-ba53-812ef9241a78
xmp.did:efa7ff44-b17d-d449-8cbc-4cf525bcc8d1
@@ -71,7 +71,7 @@
True
False
- 48.000000
+ 24.000000
24.000000
Pixels
@@ -309,17 +309,17 @@
-endstream
endobj
3 0 obj
<>
endobj
35 0 obj
<>
endobj
37 0 obj
<>
endobj
5 0 obj
<>>>/Thumb 2922 0 R/TrimBox[0.0 0.0 48.0 24.0]/Type/Page/PieceInfo<>>>
endobj
2919 0 obj
<>stream
-H10ݧjq@dBM8o:H9-Z ZYŁvmINEpL/.)rSl:g$9iF? Z
-endstream
endobj
2920 0 obj
<>
endobj
2922 0 obj
<>stream
-8;Xp,*?>+_(]]W#%j(~>
-endstream
endobj
2923 0 obj
<>
endobj
2925 0 obj
<>
endobj
2926 0 obj
<>stream
+endstream
endobj
3 0 obj
<>
endobj
35 0 obj
<>
endobj
37 0 obj
<>
endobj
5 0 obj
<>>>/Thumb 3150 0 R/TrimBox[0.0 0.0 24.0 24.0]/Type/Page/PieceInfo<>>>
endobj
3147 0 obj
<>stream
+H10ݧjqvR Ƃ*
N3~[t-Z ZYŁzloZSP7E6H(6^\SftHfsF33Ü Y
+endstream
endobj
3148 0 obj
<>
endobj
3150 0 obj
<>stream
+8;Xp,*=;cJ$ihU'#ES~>
+endstream
endobj
3151 0 obj
<>
endobj
3153 0 obj
<>
endobj
3154 0 obj
<>stream
%!PS-Adobe-3.0
%%Creator: Adobe Illustrator(R) 24.0
%%AI8_CreatorVersion: 27.2.0
%%For: (Makham) ()
%%Title: (graphics x2.ai)
-%%CreationDate: 3/2/2023 1:46 PM
+%%CreationDate: 3/5/2023 12:04 PM
%%Canvassize: 16383
%%BoundingBox: -48 -240 604 0
%%HiResBoundingBox: -47.3922855564306 -240 603.17639088057 0
@@ -348,9 +348,9 @@ endstream
endobj
2923 0 obj
<>stream
-%AI24_ZStandard_Data(/ XT.F)+
djIKY}!͕h$}/{:`uЩ724LYwRɧ7>ʋ4mɫ=úCIݠw,)w\RɜqP[{(i]L枾̸9#@F *&`(,`B&*4
-
-, IGHlZ4?YO2Dr9qvȂ-cp瞒lQIyfnc9"b_BGV=zͦz6/w$sGrN<