akkartik/pong.love - Change RKSQE3PJXJCH4NVBACWIB33H5MMNCEEQ6NHMFARMM2IV55IGBORAC

resolve conflicts

Created by akkartik on November 25, 2023

RKSQE3PJXJCH4NVBACWIB33H5MMNCEEQ6NHMFARMM2IV55IGBORAC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 127 [6.1]

B:BD[5.84659] → [5.84659:84732]

  if App.ctrl_down() or App.alt_down() or App.cmd_down() then return end

[5.84659]

[5.84732]

  if App.any_modifier_down() then
    if App.key_down(t) then
      -- The modifiers didn't change the key. Handle it in keychord_pressed.
      return
    else
      -- Key mutated by the keyboard layout. Continue below.
    end
  end

Deletion in text.lua at line 957 [6.1]

B:BD[5.115545] → [2.284:284]

B:BD[7.1182] → [4.4:240]

BD:BD[7.1182] → [4.4:240]

  if App.any_modifier_down() then
    if App.key_down(t) then
      -- The modifiers didn't change the key. Handle it in keychord_pressed.
      return
    else
      -- Key mutated by the keyboard layout. Continue below.
    end
  end

Solving an order conflict in text.lua at line 957 [6.1]
[5.115545]

Replacement in source_text.lua at line 202 [9.83786]

B:BD[8.96811] → [8.96811:96884]

  if App.ctrl_down() or App.alt_down() or App.cmd_down() then return end

[8.96811]

[8.96884]

  if App.any_modifier_down() then
    if App.key_down(t) then
      -- The modifiers didn't change the key. Handle it in keychord_pressed.
      return
    else
      -- Key mutated by the keyboard layout. Continue below.
    end
  end

Deletion in source_text.lua at line 274 [9.83786]

B:BD[8.101399] → [10.3038:3038]

B:BD[9.97240] → [3.8:244]

BD:BD[9.97240] → [3.8:244]

  if App.any_modifier_down() then
    if App.key_down(t) then
      -- The modifiers didn't change the key. Handle it in keychord_pressed.
      return
    else
      -- Key mutated by the keyboard layout. Continue below.
    end
  end

Solving an order conflict in source_text.lua at line 274 [9.83786]
[8.101399]
[12.3967]