akkartik/etch.love - Change FPT43Z3CN3UNU6V7VCANJIISS4FT7GHWABGID44GTYFAJQOIIYUAC

A slate to write and draw on, then export to html

resolve conflicts

Created by akkartik on July 10, 2024

FPT43Z3CN3UNU6V7VCANJIISS4FT7GHWABGID44GTYFAJQOIIYUAC

Dependencies

In channels

main

Change contents

Resurrecting zombie bytes in edit.lua at line 523 [8.413]
B:B[5.230] → [6.562:634]
BD:B[5.230] → [6.562:634]
∅:∅[9.1144] → [6.634:668]
B:B[6.634] → [6.634:668]
BD:B[6.634] → [6.634:668]
```
  Font_height = font_height
  Line_height = math.floor(Font_height*1.3)
  State.font_height = Font_height
```

Insertion in edit.lua at line 523 [8.413]

[10.6146]

[6.562]

function edit.update_font_settings(State, font_height, font)

Deletion in edit.lua at line 527 [8.413]
B:BD[6.668] → [3.400:450]
```
  State.font = love.graphics.newFont(Font_height)
```
Resurrecting zombie bytes in edit.lua at line 527 [8.413]
∅:∅[3.450] → [6.728:762]
B:B[6.728] → [6.728:762]
BD:B[6.728] → [6.728:762]
```
  State.line_height = Line_height
```

Insertion in edit.lua at line 527 [8.413]

[6.668]

[6.728]

  State.font = font or love.graphics.newFont(Font_height)

Deletion in edit.lua at line 595 [8.413]
B:BD[10.7287] → [2.224:224]
B:BD[10.6146] → [4.0:61]
BD:BD[10.6146] → [4.0:61]
B:BD[5.264] → [4.62:126]
BD:BD[5.264] → [4.62:126]
```
function edit.update_font_settings(State, font_height, font)
  State.font = font or love.graphics.newFont(State.font_height)
```
Solving an order conflict in edit.lua at line 595 [8.413]
[10.7287]