Merge remote-tracking branch 'origin'

pokepetter · Jun 13, 2024 · 77961f4 · 77961f4
2 parents b39048e + cffa08e
commit 77961f4
Show file tree

Hide file tree

Showing 17 changed files with 609 additions and 4,937 deletions.
diff --git a/cmyk_swap/card_back.png b/cmyk_swap/card_back.png
diff --git a/cmyk_swap/cmyk_swap.html b/cmyk_swap/cmyk_swap.html
diff --git a/cmyk_swap/cmyk_swap_banner.png b/cmyk_swap/cmyk_swap_banner.png
diff --git a/cmyk_swap/cmyk_swap_banner.psd b/cmyk_swap/cmyk_swap_banner.psd
diff --git a/cmyk_swap/cmyk_swap_screenshot.png b/cmyk_swap/cmyk_swap_screenshot.png
diff --git a/cmyk_swap/cmyk_swap_screenshot_2.png b/cmyk_swap/cmyk_swap_screenshot_2.png
diff --git a/cmyk_swap/cmyk_swap_screenshot_3.png b/cmyk_swap/cmyk_swap_screenshot_3.png
diff --git a/cmyk_swap/frame.png b/cmyk_swap/frame.png
diff --git a/cmyk_swap/frame_2.png b/cmyk_swap/frame_2.png
diff --git a/cmyk_swap/frame_gold.png b/cmyk_swap/frame_gold.png
diff --git a/cmyk_swap/icon.png b/cmyk_swap/icon.png
diff --git a/cmyk_swap/impact_effect.gif b/cmyk_swap/impact_effect.gif
diff --git a/cmyk_swap/sparkle_impact.gif b/cmyk_swap/sparkle_impact.gif
diff --git a/otosopp/package-lock.json b/otosopp/package-lock.json
diff --git a/otosopp/package.json b/otosopp/package.json
diff --git a/taptapir b/taptapir
diff --git a/todo/todo_list.html b/todo/todo_list.html
@@ -82,7 +82,7 @@
             pages[page_index][i][1] = e.slider.value
 
         e.delete_button = *Button(parent=e, color='#eeeeee', scale=[.08/e.scale_x,.08/e.scale_y], origin=[.5,0], x=.5-.01, text='✕', text_size=1.5, shadow=None)
-        e.delete_button.on_click = def():
+        e.delete_button.on_click = def delete_entry(e=e):
             confirm_delete_button.parent = e.delete_button
             confirm_delete_button.xy = [0,0]
             confirm_delete_button.enabled = True