akkartik/spell-cards.love - Change 2HPGAYGTXIIBSOCZ42TQ4DMAWYVPTRZBBNEBUGK3GWBN3W64UCPAC

resolve conflicts

Created by akkartik on May 6, 2025

2HPGAYGTXIIBSOCZ42TQ4DMAWYVPTRZBBNEBUGK3GWBN3W64UCPAC

Dependencies

In channels

main

Change contents

Replacement in 0050-on.keychord_press at line 1 [2.34]

B:BD[2.34] → [2.35:76]

on.keychord_press = function(chord, key)

[2.34]

[2.76]

on.keychord_press = function(chord, key, scancode, is_repeat)

Replacement in 0050-on.keychord_press at line 8 [2.34]
B:BD[2.204] → [2.204:239]
```
		teach_keychord_press(chord, key)
```
[2.204]
[2.239]
```
		teach_keychord_press(chord, key, scancode, is_repeat)
```
Replacement in 0050-on.keychord_press at line 10 [2.34]
B:BD[2.245] → [2.245:280]
```
		learn_keychord_press(chord, key)
```
[2.245]
[2.280]
```
		learn_keychord_press(chord, key, scancode, is_repeat)
```

Replacement in 0049-learn_keychord_press at line 1 [3.33]

B:BD[3.33] → [3.34:78]

learn_keychord_press = function(chord, key)

[3.33]

[3.78]

learn_keychord_press = function(chord, key, scancode, is_repeat)

Replacement in 0049-learn_keychord_press at line 16 [3.33]

B:BD[3.459] → [3.459:503]

		edit.keychord_press(Workbook, chord, key)

[3.459]

[3.503]

		edit.keychord_press(Workbook, chord, key, scancode, is_repeat)

Replacement in 0042-learn_mouse_release at line 1 [4.14898]

B:BD[4.14898] → [4.14899:14998]

learn_mouse_release = function(x,y, mouse_button)
	edit.mouse_release(Workbook, x,y, mouse_button)

[4.14898]

[4.14998]

learn_mouse_release = function(x,y, mouse_button, is_touch, presses)
	edit.mouse_release(Workbook, x,y, mouse_button, is_touch, presses)

Replacement in 0041-learn_mouse_press at line 1 [4.16121]

B:BD[4.16121] → [4.16122:16170]

learn_mouse_press = function(x,y, mouse_button)

[4.16121]

[4.16170]

learn_mouse_press = function(x,y, mouse_button, is_touch, presses)

Replacement in 0041-learn_mouse_press at line 5 [4.16121]

B:BD[4.16211] → [4.16211:16259]

		edit.mouse_press(Workbook, x,y, mouse_button)

[4.16211]

[4.16259]

		edit.mouse_press(Workbook, x,y, mouse_button, is_touch, presses)

Replacement in 0017-teach_mouse_press at line 1 [5.37066]

B:BD[5.37066] → [5.37067:37115]

teach_mouse_press = function(x,y, mouse_button)

[5.37066]

[5.37115]

teach_mouse_press = function(x,y, mouse_button, is_touch, presses)

Replacement in 0017-teach_mouse_press at line 10 [5.37066]

B:BD[5.37266] → [5.37266:37318]

			edit.mouse_press(Cursor_word, x,y, mouse_button)

[5.37266]

[5.37318]

			edit.mouse_press(Cursor_word, x,y, mouse_button, is_touch, presses)

Replacement in 0011-on.mouse_release at line 1 [6.6019]

B:BD[6.6019] → [6.6020:6067]

on.mouse_release = function(x,y, mouse_button)

[6.6019]

[6.6067]

on.mouse_release = function(x,y, mouse_button, is_touch, presses)

Replacement in 0011-on.mouse_release at line 3 [6.6019]

B:BD[6.6092] → [6.6092:6133]

		teach_mouse_release(x,y, mouse_button)

[6.6092]

[6.6133]

		teach_mouse_release(x,y, mouse_button, is_touch, presses)

Replacement in 0011-on.mouse_release at line 5 [6.6019]

B:BD[6.6139] → [6.6139:6180]

		learn_mouse_release(x,y, mouse_button)

[6.6139]

[6.6180]

		learn_mouse_release(x,y, mouse_button, is_touch, presses)

Replacement in 0010-on.mouse_press at line 1 [6.6727]

B:BD[6.6727] → [6.6728:6773]

on.mouse_press = function(x,y, mouse_button)

[6.6727]

[6.6773]

on.mouse_press = function(x,y, mouse_button, is_touch, presses)

Replacement in 0010-on.mouse_press at line 3 [6.6727]

B:BD[6.6798] → [6.6798:6837]

		teach_mouse_press(x,y, mouse_button)

[6.6798]

[6.6837]

		teach_mouse_press(x,y, mouse_button, is_touch, presses)

Replacement in 0010-on.mouse_press at line 5 [6.6727]

B:BD[6.6843] → [6.6843:6882]

		learn_mouse_press(x,y, mouse_button)

[6.6843]

[6.6882]

		learn_mouse_press(x,y, mouse_button, is_touch, presses)

Replacement in 0008-teach_keychord_press at line 1 [6.9318]

B:BD[6.9318] → [6.9319:9363]

teach_keychord_press = function(chord, key)

[6.9318]

[6.9363]

teach_keychord_press = function(chord, key, scancode, is_repeat)

Replacement in 0008-teach_keychord_press at line 9 [6.9318]

B:BD[6.9533] → [6.9533:9581]

			edit.keychord_press(Cursor_word, chord, key)

[6.9533]

[6.9581]

			edit.keychord_press(Cursor_word, chord, key, scancode, is_repeat)

Replacement in 0007-teach_mouse_release at line 1 [6.10093]

B:BD[6.10093] → [6.10094:10144]

teach_mouse_release = function(x,y, mouse_button)

[6.10093]

[6.10144]

teach_mouse_release = function(x,y, mouse_button, is_touch, presses)

Replacement in 0007-teach_mouse_release at line 3 [6.10093]

B:BD[6.10165] → [6.10165:10218]

		edit.mouse_release(Cursor_word, x,y, mouse_button)

[6.10165]

[6.10218]

		edit.mouse_release(Cursor_word, x,y, mouse_button, is_touch, presses)