akkartik/mastodon-unfurl.love - Change HLKLL24G3ZZQK6WRPLTBMLSVYDR26OCQO2RBF4GNDYI624X7AWKAC

resolve conflicts

Created by akkartik on July 26, 2024

HLKLL24G3ZZQK6WRPLTBMLSVYDR26OCQO2RBF4GNDYI624X7AWKAC

Dependencies

In channels

main

Change contents

File un-deletion: 0426-A, 0426-A
BFD:BF[3.146] → [4.6019:6019]
BFD:BF[4.6695] → [4.6019:6019]
BFD:BF[6.2] → [4.6665:6695]
BFD:BF[6.2] → [4.6665:6695]
File un-deletion: 0385-compute_layout, 0385-compute_layout
BFD:BF[3.742] → [7.4307:4307]
BFD:BF[7.7033] → [7.4307:4307]
BFD:BF[6.2] → [7.6990:7033]
BFD:BF[6.2] → [7.6990:7033]
Replacement in 0043-render_nodes_to_surface at line 1 [8.2001]
B:BD[8.2001] → [8.2002:2039]
```
render_nodes_to_surface = function()
```
[8.2001]
[8.2039]
```
render_nodes_to_surface = function(font)
```

Deletion in 0043-render_nodes_to_surface at line 12 [8.2001]

B:BD[8.2460] → [8.2460:2504]

B:BD[8.2504] → [2.449:525]

	-- we're going to be computing box heights
	local font = love.graphics.newFont(scale(20))
	love.graphics.setFont(font)

Replacement in 0043-render_nodes_to_surface at line 21 [8.2001]
∅:D[2.660] → [8.2867:2871]
B:BD[8.2867] → [8.2867:2871]
```
end
```
[2.660]
```
end
```

Replacement in 0028-A at line 3 [9.203421]

B:BD[8.2972] → [8.2972:3109]

B:BD[8.3109] → [5.78:83]

∅:D[5.83] → [10.159:163]

∅:D[11.138] → [10.159:163]

∅:D[8.3114] → [10.159:163]

B:BD[9.203603] → [10.159:163]

	love.graphics.setFont(love.graphics.newFont(scale(20)))  -- editor objects implicitly depend on current font
	render_nodes_to_surface()
	B()
end

[8.2972]

	local font = love.graphics.newFont(scale(20))
	love.graphics.setFont(font)  -- editor objects implicitly depend on current font
	render_nodes_to_surface(font)
	B(font)
end

Replacement in 0021-compute_layout at line 104 [12.23871]
B:BD[12.26598] → [10.226:230]
```
end
```
[12.26598]
```
end
```

resolve conflicts

Dependencies

In channels

Change contents

File un-deletion: 0426-A, 0426-A

File un-deletion: 0385-compute_layout, 0385-compute_layout

Replacement in 0043-render_nodes_to_surface at line 1 [8.2001]

Deletion in 0043-render_nodes_to_surface at line 12 [8.2001]

Replacement in 0043-render_nodes_to_surface at line 21 [8.2001]

Replacement in 0028-A at line 3 [9.203421]

Replacement in 0021-compute_layout at line 104 [12.23871]