akkartik/pong.love - Change SPXS2WOLSSEEGOY5XJOITKPBL6MSD7NSXC4ESFVKP63PEFTEP33AC

resolve conflicts

Created by akkartik on December 7, 2023

SPXS2WOLSSEEGOY5XJOITKPBL6MSD7NSXC4ESFVKP63PEFTEP33AC

Dependencies

In channels

main

Change contents

Insertion in main.lua at line 34 [8.2]

[6.348]

[7.222]


  -- Current_app =
  --  | pong
  --  | source
  --  | {name=warning message='...' next_app = pong|source}

Replacement in main.lua at line 64 [8.2]
B:BD[9.168] → [2.20:57]
```
  elseif Current_app == 'error' then
```
[9.168]
[10.157407]
```
  elseif current_app_is_warning() then
```

Replacement in main.lua at line 70 [8.2]

B:BD[11.1017] → [11.1017:1184]

B:BD[11.1184] → [3.0:92]

∅:D[3.92] → [11.1268:1762]

B:BD[11.1268] → [11.1268:1762]

∅:D[9.168] → [6.1118:1128]

∅:D[11.1762] → [6.1118:1128]

∅:D[10.157467] → [6.1118:1128]

B:BD[6.1118] → [6.1118:1128]

function App.version_check()
  -- available modes: run, error
  Error_message = nil
  Error_count = 0
  -- we'll reuse error mode on load for an initial version check
  local supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first
  local minor_version
  Major_version, minor_version = love.getVersion()
  Version = Major_version..'.'..minor_version
  if array.find(supported_versions, Version) == nil then
    Current_app = 'error'
    Error_message = ("This app doesn't support version %s; please use version %s. Press any key to try it with this version anyway."):format(Version, supported_versions[1])
    print(Error_message)
    -- continue initializing everything; hopefully we won't have errors during initialization
  end
end

[11.1017]

[12.127]

function App.initialize_globals()
  Supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first
  check_love_version_for_tests()

Deletion in main.lua at line 74 [8.2]
B:BD[12.128] → [7.559:593]
```
function App.initialize_globals()
```
Replacement in main.lua at line 78 [8.2]
B:BD[6.1261] → [2.58:95]
```
  elseif Current_app == 'error' then
```
[6.1261]
[6.1261]
```
  elseif current_app_is_warning() then
```
Deletion in main.lua at line 87 [8.2]
∅:D[13.412] → [7.670:674]
B:BD[7.670] → [7.670:674]
```
end
```
Deletion in main.lua at line 88 [8.2]
B:BD[14.163] → [15.83:109]
B:BD[16.80] → [16.80:232]
∅:D[15.109] → [17.12432:12464]
∅:D[16.232] → [17.12432:12464]
∅:D[18.571] → [17.12432:12464]
B:BD[15.109] → [17.12432:12464]
B:BD[18.571] → [17.12432:12464]
B:BD[19.1629] → [17.12432:12464]
∅:D[18.596] → [15.110:132]
B:BD[17.12517] → [15.110:132]
∅:D[15.132] → [17.12542:12580]
B:BD[17.12542] → [17.12542:12580]
∅:D[18.619] → [15.133:157]
B:BD[18.619] → [15.133:157]
B:BD[17.12637] → [15.133:157]
B:BD[15.157] → [2.96:133]
∅:D[2.133] → [7.676:676]
B:BD[15.157] → [7.676:676]
B:BD[7.676] → [7.677:684]
∅:D[7.684] → [17.12665:12718]
B:BD[20.122] → [17.12665:12718]
B:BD[17.12718] → [7.686:686]
∅:D[21.31] → [20.142:148]
∅:D[7.686] → [20.142:148]
∅:D[17.12718] → [20.142:148]
∅:D[22.17348] → [20.142:148]
∅:D[23.184849] → [20.142:148]
∅:D[24.185028] → [20.142:148]
B:BD[20.142] → [20.142:148]
B:BD[17.12771] → [25.66:71]
B:BD[26.1248] → [17.12772:12961]
B:BD[27.31] → [5.20:173]
BD:BD[27.31] → [5.20:173]
BD:BD[27.31] → [5.20:173]
B:BD[23.186281] → [23.186281:186411]
BD:BD[23.186281] → [23.186281:186411]
B:BD[23.186411] → [29.20:57]
BD:BD[23.186411] → [29.20:57]
B:BD[23.186411] → [28.74:113]
BD:BD[23.186411] → [28.74:113]
∅:D[29.57] → [23.186411:186477]
∅:D[28.113] → [23.186411:186477]
∅:D[7.688] → [23.186411:186477]
B:BD[23.186411] → [23.186411:186477]
B:BD[23.186411] → [23.186411:186477]
B:BD[23.186477] → [13.413:447]
B:BD[30.414] → [28.114:115]
BD:BD[30.414] → [28.114:115]
```
function App.initialize()
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)
  love.graphics.setBackgroundColor(1,1,1)
  if Current_app == 'pong' then
    pong.initialize()
  elseif Current_app == 'source' then
    source.initialize()
  elseif Current_app == 'error' then
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
end
function App.resize(w,h)
  if Current_app == 'pong' then
    if pong.resize then pong.resize(w,h) end
  elseif Current_app == 'source' then
    if source.resize then source.resize(w,h) end
function App.initialize_globals()
  Supported_versions = {'11.5', '11.4', '12.0'}  -- put the recommended version first
  check_love_version_for_tests()
  if Current_app == 'run' then
    run.initialize_globals()
  elseif Current_app == 'source' then
    source.initialize_globals()
  elseif Current_app == 'error' then
  elseif current_app_is_warning() then
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
  Last_resize_time = Current_time
```

Resurrecting zombie bytes in main.lua at line 88 [8.2]

B:B[28.115] → [28.115:717]

BD:B[28.115] → [28.115:717]

  -- Another weird bit for a class of corner cases. E.g.:
  -- * I press ctrl+e, switch Current_app. I don't want the new app to receive
  --   text_input and key_release events.
  -- If I try to avoid text_input events by switching modes on key_release, I
  -- hit a new problem:
  -- * I press ctrl+e, am running an untested version, Current_app goes to
  --   'warning', and immediately rolls back out of 'warning' in the
  --   key_release event.
  -- Skip_rest_of_key_events is ugly, but feels cleaner than creating yet
  -- another possible value for Current_app.
  Skip_rest_of_key_events = nil

Resurrecting zombie bytes in main.lua at line 99 [8.2]
∅:∅[30.414] → [21.38:42]
∅:∅[30.414] → [21.38:42]
∅:∅[13.447] → [21.38:42]
∅:∅[28.717] → [21.38:42]
B:B[30.414] → [21.38:42]
B:B[24.187113] → [21.38:42]
B:B[24.187113] → [21.38:42]
D:∅[30.414] → [21.38:42]
D:∅[24.187113] → [21.38:42]
BD:B[13.447] → [21.38:42]
```
end
```
Deletion in main.lua at line 101 [8.2]
B:BD[7.690] → [2.135:135]
B:BD[21.42] → [28.718:719]
BD:BD[21.42] → [28.718:719]
BD:BD[21.42] → [28.718:719]
BD:BD[21.42] → [28.718:719]
Resurrecting zombie bytes in main.lua at line 101 [8.2]
B:B[28.719] → [28.719:980]
BD:B[28.719] → [28.719:980]
BD:B[28.719] → [28.719:980]
BD:B[28.719] → [28.719:980]
∅:∅[28.980] → [32.1005:1016]
B:B[32.1005] → [32.1005:1016]
BD:B[32.1005] → [32.1005:1016]
BD:B[32.1005] → [32.1005:1016]
```
function check_love_version_for_tests()
  if array.find(Supported_versions, Version) == nil then
    -- warning to include in an error message if any tests failed
    Warning_before_tests = ("This app hasn't been tested with LÖVE version %s."):format(Version)
  end
end
```
Solving an order conflict in main.lua at line 101 [8.2]
[7.690]
[28.719]
Resurrecting zombie bytes in main.lua at line 108 [8.2]
B:B[24.187329] → [31.673:697]
BD:B[24.187329] → [31.673:697]
BD:B[24.187329] → [31.673:697]
B:B[33.1320] → [31.698:785]
BD:B[33.1320] → [31.698:785]
BD:B[33.1320] → [31.698:785]
B:B[31.785] → [34.323:521]
BD:B[31.785] → [34.323:521]
BD:B[31.785] → [34.323:521]
∅:∅[34.521] → [31.1031:1136]
B:B[31.1031] → [31.1031:1136]
BD:B[31.1031] → [31.1031:1136]
BD:B[31.1031] → [31.1031:1136]
```
  check_love_version()
function check_love_version()
  if array.find(Supported_versions, Version) == nil then
    show_warning(
      ("This app hasn't been tested with LÖVE version %s; please switch to version %s if you run into issues. Press any key to continue."):format(Version, Supported_versions[1]))
    -- continue initializing everything; hopefully we won't have errors during initialization
  end
end
```

Insertion in main.lua at line 108 [8.2]

[32.1016]

[31.673]

function App.initialize()
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)
  love.graphics.setBackgroundColor(1,1,1)

Insertion in main.lua at line 114 [8.2]

[31.674]

  if Current_app == 'pong' then
    pong.initialize()
  elseif Current_app == 'source' then
    source.initialize()
  elseif current_app_is_warning() then
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end

Insertion in main.lua at line 124 [8.2]
[31.697]
[31.698]
```
end
```
Deletion in main.lua at line 134 [8.2]
B:BD[24.187263] → [34.283:322]
BD:BD[24.187263] → [34.283:322]
```
  elseif current_app_is_warning() then
```
Resurrecting zombie bytes in main.lua at line 134 [8.2]
B:B[24.187407] → [34.522:568]
BD:B[24.187407] → [34.522:568]
B:B[23.187493] → [28.1030:1076]
BD:B[23.187493] → [28.1030:1076]
```
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
```
Solving an order conflict in main.lua at line 134 [8.2]
[31.1136]
Insertion in main.lua at line 134 [8.2]
[0.772]
[34.522]
```
function App.resize(w,h)
```

Insertion in main.lua at line 136 [8.2]

[34.568]

[28.1030]

  if Current_app == 'pong' then
    if pong.resize then pong.resize(w,h) end
  elseif Current_app == 'source' then
    if source.resize then source.resize(w,h) end
  else
    assert(false, 'unknown app "'..Current_app..'"')
  end
  Last_resize_time = Current_time
end
function App.filedropped(file)

Insertion in main.lua at line 148 [8.2]

[28.1076]

[35.1113]

  if Current_app == 'pong' then
    if pong.file_drop then pong.file_drop(file) end
  elseif Current_app == 'source' then
    if source.file_drop then source.file_drop(file) end
  else
    assert(false, 'unknown app "'..Current_app..'"')

Insertion in main.lua at line 158 [8.2]
[17.13345]
[17.13345]
```
  if current_app_is_warning() then return end
```
Deletion in main.lua at line 166 [8.2]
B:BD[17.13576] → [2.174:211]
```
  elseif Current_app == 'error' then
```
Replacement in main.lua at line 176 [8.2]
B:BD[2.316] → [2.316:353]
```
  elseif Current_app == 'error' then
```
[2.316]
[11.1796]
```
  elseif current_app_is_warning() then
```

Replacement in main.lua at line 180 [8.2]

B:BD[11.1942] → [11.1942:1994]

    love.graphics.printf(Error_message, 40,40, 600)

[11.1942]

[17.13741]

    love.graphics.printf(Current_app.message, 40,40, 600)

Deletion in main.lua at line 184 [8.2]
B:BD[26.1521] → [2.355:355]
B:BD[29.198] → [28.1077:1116]
BD:BD[29.198] → [28.1077:1116]
BD:BD[29.198] → [28.1077:1116]
B:BD[36.690] → [28.1117:1175]
BD:BD[36.690] → [28.1117:1175]
BD:BD[36.690] → [28.1117:1175]
B:BD[23.187951] → [28.1177:1177]
BD:BD[23.187951] → [28.1177:1177]
```
  elseif current_app_is_warning() then
    love.graphics.printf(Current_app.message, 40,40, 600)
```
Solving an order conflict in main.lua at line 184 [8.2]
[26.1521]
[8.416]
Deletion in main.lua at line 221 [8.2]
B:BD[24.189585] → [31.1447:1482]
BD:BD[24.189585] → [31.1447:1482]
```
    Skip_rest_of_key_events = true
```

Replacement in main.lua at line 231 [8.2]

B:BD[37.456] → [2.356:395]

    elseif Current_app == 'error' then

[37.456]

[38.205]

    elseif current_app_is_warning() then

Insertion in main.lua at line 241 [8.2]
[39.46]
[17.14366]
```
    Skip_rest_of_key_events = true
```
Insertion in main.lua at line 260 [8.2]
[17.14729]
[17.14729]
```
  if Skip_rest_of_key_events then return end
```
Deletion in main.lua at line 268 [8.2]
B:BD[24.189951] → [31.1483:1528]
BD:BD[24.189951] → [31.1483:1528]
```
  if Skip_rest_of_key_events then return end
```

Replacement in main.lua at line 277 [8.2]

B:BD[17.15071] → [3.93:187]

  if Current_app == 'error' then
    Current_app = 'pong'
  elseif Current_app == 'pong' then

[17.15071]

[40.69]

  if Skip_rest_of_key_events then return end
  if Current_app == 'pong' then

Deletion in main.lua at line 282 [8.2]
B:BD[41.213] → [36.899:899]
B:BD[24.190302] → [31.1574:1650]
BD:BD[24.190302] → [31.1574:1650]
BD:BD[24.190302] → [31.1574:1650]
```
  if Skip_rest_of_key_events then return end
  if Current_app == 'run' then
```
Solving an order conflict in main.lua at line 282 [8.2]
[41.213]
[24.190866]
Deletion in main.lua at line 287 [8.2]
B:BD[42.456] → [34.868:909]
BD:BD[42.456] → [34.868:909]
BD:BD[42.456] → [34.868:909]
```
    elseif current_app_is_warning() then
```
Solving an order conflict in main.lua at line 287 [8.2]
[43.361]
[17.15328]

Replacement in main.lua at line 288 [8.2]

B:BD[17.15373] → [11.2033:2077]

  if Current_app == 'error' then return end

[17.15373]

[44.334]

  if current_app_is_warning() then return end

Replacement in main.lua at line 300 [8.2]

B:BD[45.322] → [11.2078:2122]

  if Current_app == 'error' then return end

[45.322]

  if current_app_is_warning() then return end

Replacement in main.lua at line 311 [8.2]
B:BD[45.644] → [2.397:397]
∅:D[2.397] → [11.2123:2167]
B:BD[45.644] → [11.2123:2167]
```
  if Current_app == 'error' then return end
```
[45.644]
[3.189]
```
  if current_app_is_warning() then return end
```

Replacement in main.lua at line 313 [8.2]

∅:D[3.221] → [46.43:108]

B:BD[46.43] → [46.43:108]

    if run.mouse_wheel_move then run.mouse_wheel_move(dx,dy) end

[3.221]

[46.108]

    if pong.mouse_wheel_move then pong.mouse_wheel_move(dx,dy) end

Replacement in main.lua at line 322 [8.2]

B:BD[45.874] → [11.2170:2214]

  if Current_app == 'error' then return end

[45.874]

  if current_app_is_warning() then return end

Deletion in main.lua at line 338 [8.2]
B:BD[45.1309] → [2.399:399]
B:BD[47.889] → [28.1320:1320]
BD:BD[47.889] → [28.1320:1320]
BD:BD[47.889] → [28.1320:1320]
BD:BD[47.889] → [28.1320:1320]
BD:BD[47.889] → [28.1320:1320]
∅:D[28.1320] → [34.1098:1144]
B:BD[49.925] → [34.1098:1144]
BD:BD[49.925] → [34.1098:1144]
BD:BD[49.925] → [34.1098:1144]
BD:BD[49.925] → [34.1098:1144]
B:BD[24.191780] → [34.1192:1196]
BD:BD[24.191780] → [34.1192:1196]
```
  if current_app_is_warning() then return end
end
```

Resurrecting zombie bytes in main.lua at line 338 [8.2]

B:B[34.1196] → [34.1196:1474]

BD:B[34.1196] → [34.1196:1474]

B:B[50.268] → [34.1475:1581]

BD:B[50.268] → [34.1475:1581]


function current_app_is_warning()
  return type(Current_app) == 'table' and Current_app.name == 'warning'
end
function show_warning(message)
  assert(type(Current_app) == 'string')
  Current_app = {
    name = 'warning',
    message = message,
    next_app = Current_app,
  }
function clear_warning()
  assert(type(Current_app) == 'table')
  Current_app = Current_app.next_app
end

Solving an order conflict in main.lua at line 338 [8.2]
[45.1309]
[34.1196]
Insertion in main.lua at line 350 [8.2]
[34.1474]
[34.1475]
```
end
```
Deletion in main.lua at line 356 [8.2]
B:BD[34.1581] → [5.175:175]
BD:BD[34.1581] → [5.175:175]
B:BD[47.1071] → [28.1321:1367]
BD:BD[47.1071] → [28.1321:1367]
BD:BD[47.1071] → [28.1321:1367]
B:BD[23.190738] → [28.1368:1414]
BD:BD[23.190738] → [28.1368:1414]
∅:D[2.135] → [24.187670:187701]
∅:D[16.234] → [24.187670:187701]
∅:D[7.690] → [24.187670:187701]
B:BD[51.41] → [24.187670:187701]
B:BD[24.187701] → [52.7319:7403]
B:BD[24.187701] → [28.981:1027]
BD:BD[24.187701] → [28.981:1027]
∅:D[52.7403] → [53.8094:8132]
B:BD[54.4479] → [53.8094:8132]
∅:D[53.8132] → [54.4480:4536]
B:BD[24.187824] → [54.4480:4536]
B:BD[54.4536] → [2.136:173]
∅:D[2.173] → [17.13202:13262]
B:BD[17.13202] → [17.13202:13262]
B:BD[17.13262] → [13.449:449]
B:BD[54.4536] → [28.1029:1029]
BD:BD[54.4536] → [28.1029:1029]
B:BD[55.127] → [34.0:106]
D:D[55.127] → [34.0:106]
BD:BD[55.127] → [34.0:106]
B:BD[24.186724] → [34.107:146]
BD:BD[24.186724] → [34.107:146]
BD:BD[24.186724] → [34.107:146]
B:BD[34.106] → [28.20:73]
BD:BD[34.106] → [28.20:73]
```
  if current_app_is_warning() then return end
  if current_app_is_warning() then return end
function App.filedropped(file)
  if Current_app == 'pong' then
    if pong.file_drop then pong.file_drop(file) end
  if current_app_is_warning() then return end
  elseif Current_app == 'source' then
    if source.file_drop then source.file_drop(file) end
  elseif Current_app == 'error' then
  else
    assert(false, 'unknown app "'..Current_app..'"')
  -- Current_app =
  --  | run
  --  | source
  --  | {name=warning message='...' next_app = run|source}
  elseif current_app_is_warning() then
  if Current_app == nil then
    Current_app = 'run'
```
Solving an order conflict in main.lua at line 356 [8.2]
[34.1581]
Insertion in app.lua at line 11 [57.2]
[57.54]
[58.346]
```
  Version, Major_version = App.love_version()
```

Insertion in app.lua at line 88 [57.2]

[33.5849]

[58.369]

function App.love_version()
  local major_version, minor_version = love.getVersion()
  local version = major_version..'.'..minor_version
  return version, major_version
end

Replacement in app.lua at line 111 [57.2]

B:BD[59.20738] → [60.144931:145029]

    error(('There were %d test failures:\n\n%s'):format(#Test_errors, table.concat(Test_errors)))

[59.20738]

[59.20808]

    local error_message = ''
    if Warning_before_tests then
      error_message = Warning_before_tests..'\n\n'
    end
    error_message = error_message .. ('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors))
    error(error_message)

Deletion in app.lua at line 121 [57.2]

B:BD[39.253] → [39.253:258]

B:BD[39.258] → [61.35:35]

B:BD[33.5849] → [28.1479:1648]

BD:BD[33.5849] → [28.1479:1648]

end
function App.love_version()
  local major_version, minor_version = love.getVersion()
  local version = major_version..'.'..minor_version
  return version, major_version

Resurrecting zombie bytes in app.lua at line 121 [57.2]
B:B[28.1648] → [28.1648:1653]
BD:B[28.1648] → [28.1648:1653]
```
end
```
Solving an order conflict in app.lua at line 121 [57.2]
[39.253]
[28.1648]

Deletion in app.lua at line 527 [57.2]

B:BD[33.8166] → [28.1924:1924]

B:BD[62.35229] → [28.1654:1922]

BD:BD[62.35229] → [28.1654:1922]

B:BD[57.54] → [28.1432:1478]

BD:BD[57.54] → [28.1432:1478]

    local error_message = ''
    if Warning_before_tests then
      error_message = Warning_before_tests..'\n\n'
    end
    error_message = error_message .. ('There were %d test failures:\n%s'):format(#Test_errors, table.concat(Test_errors))
    error(error_message)
  Version, Major_version = App.love_version()

Solving an order conflict in app.lua at line 527 [57.2]
[33.8166]

Replacement in Manual_tests.md at line 14 [63.1]

B:BD[3.256] → [3.256:395]

  - run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.

[3.256]

[64.194]

  - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.

Deletion in Manual_tests.md at line 21 [63.1]

B:BD[65.40] → [28.1929:2163]

BD:BD[65.40] → [28.1929:2163]

  - run with an untested version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key.
  - run with a LÖVE v12 release candidate. No errors; it is a supported version. All tests pass.

Replacement in Manual_tests.md at line 27 [63.1]

B:BD[66.868] → [4.39:254]

* run with an unsupported version. Error message pops up and waits for a key. The app attempts to continue, and doesn't receive the key. Press ctrl+e to edit source. Source editor opens up without checking version.

[66.868]

[23.211091]

* run with an untested version. Error message pops up. Press a key. Pong comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Pong returns.
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.

Deletion in Manual_tests.md at line 56 [63.1]

B:BD[67.16279] → [28.2165:2165]

B:BD[24.211526] → [31.1670:1918]

BD:BD[24.211526] → [31.1670:1918]

∅:D[31.1918] → [32.1971:2103]

B:BD[32.1971] → [32.1971:2103]

BD:BD[32.1971] → [32.1971:2103]

* run with an untested version. Error message pops up. Press a key. Text editor comes up, and doesn't receive the key. Press ctrl+e. Error pops up. Press a key. Source editor opens up. Press ctrl+e. Error pops up. Press a key. Text editor returns.
* create a couple of spuriously failing tests. Run with an untested version. Error message includes message about untested version.

Solving an order conflict in Manual_tests.md at line 56 [63.1]
[67.16279]

resolve conflicts

Dependencies

In channels

Change contents

Insertion in main.lua at line 34 [8.2]

Replacement in main.lua at line 64 [8.2]

Replacement in main.lua at line 70 [8.2]

Deletion in main.lua at line 74 [8.2]

Replacement in main.lua at line 78 [8.2]

Deletion in main.lua at line 87 [8.2]

Deletion in main.lua at line 88 [8.2]

Resurrecting zombie bytes in main.lua at line 88 [8.2]

Resurrecting zombie bytes in main.lua at line 99 [8.2]

Deletion in main.lua at line 101 [8.2]

Resurrecting zombie bytes in main.lua at line 101 [8.2]

Solving an order conflict in main.lua at line 101 [8.2]

Resurrecting zombie bytes in main.lua at line 108 [8.2]

Insertion in main.lua at line 108 [8.2]

Insertion in main.lua at line 114 [8.2]

Insertion in main.lua at line 124 [8.2]

Deletion in main.lua at line 134 [8.2]

Resurrecting zombie bytes in main.lua at line 134 [8.2]

Solving an order conflict in main.lua at line 134 [8.2]

Insertion in main.lua at line 134 [8.2]

Insertion in main.lua at line 136 [8.2]

Insertion in main.lua at line 148 [8.2]

Insertion in main.lua at line 158 [8.2]

Deletion in main.lua at line 166 [8.2]

Replacement in main.lua at line 176 [8.2]

Replacement in main.lua at line 180 [8.2]

Deletion in main.lua at line 184 [8.2]

Solving an order conflict in main.lua at line 184 [8.2]

Deletion in main.lua at line 221 [8.2]

Replacement in main.lua at line 231 [8.2]

Insertion in main.lua at line 241 [8.2]

Insertion in main.lua at line 260 [8.2]

Deletion in main.lua at line 268 [8.2]

Replacement in main.lua at line 277 [8.2]

Deletion in main.lua at line 282 [8.2]

Solving an order conflict in main.lua at line 282 [8.2]

Deletion in main.lua at line 287 [8.2]

Solving an order conflict in main.lua at line 287 [8.2]

Replacement in main.lua at line 288 [8.2]

Replacement in main.lua at line 300 [8.2]

Replacement in main.lua at line 311 [8.2]

Replacement in main.lua at line 313 [8.2]

Replacement in main.lua at line 322 [8.2]

Deletion in main.lua at line 338 [8.2]

Resurrecting zombie bytes in main.lua at line 338 [8.2]

Solving an order conflict in main.lua at line 338 [8.2]

Insertion in main.lua at line 350 [8.2]

Deletion in main.lua at line 356 [8.2]

Solving an order conflict in main.lua at line 356 [8.2]

Insertion in app.lua at line 11 [57.2]

Insertion in app.lua at line 88 [57.2]

Replacement in app.lua at line 111 [57.2]

Deletion in app.lua at line 121 [57.2]

Resurrecting zombie bytes in app.lua at line 121 [57.2]

Solving an order conflict in app.lua at line 121 [57.2]

Deletion in app.lua at line 527 [57.2]

Solving an order conflict in app.lua at line 527 [57.2]

Replacement in Manual_tests.md at line 14 [63.1]

Deletion in Manual_tests.md at line 21 [63.1]

Replacement in Manual_tests.md at line 27 [63.1]

Deletion in Manual_tests.md at line 56 [63.1]

Solving an order conflict in Manual_tests.md at line 56 [63.1]