akkartik/pensieve.love - Change ITX2QBZ2PWH53SZDYBFYVWFTXVS2DRDXTXDJALFM6AFFLELSR2MAC

Merge lines.love

Created by Kartik K. Agaram on May 30, 2023

ITX2QBZ2PWH53SZDYBFYVWFTXVS2DRDXTXDJALFM6AFFLELSR2MAC

Dependencies

In channels

main

Change contents

Deletion in source_file.lua at line 96 [5.150241]

B:BD[4.14473] → [2.272:338]

      outfile:write(json.encode(shape))
      outfile:write('\n')

Deletion in source_file.lua at line 102 [5.150241]
B:BD[4.14693] → [3.77:129]
```
      outfile:write(line)
      outfile:write('\n')
```
Solving an order conflict in source_file.lua at line 102 [5.150241]
[2.391]
[4.14725]
Deletion in source_file.lua at line 110 [5.150241]
B:BD[4.15012] → [3.130:182]
```
      outfile:write(line)
      outfile:write('\n')
```
Solving an order conflict in source_file.lua at line 110 [5.150241]
[2.444]
[4.15044]

Deletion in source_file.lua at line 111 [5.150241]

B:BD[4.15083] → [2.445:581]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}))
      outfile:write('\n')

Deletion in source_file.lua at line 114 [5.150241]

B:BD[4.15235] → [2.582:776]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}))
      outfile:write('\n')

Deletion in file.lua at line 119 [6.15083]

B:BD[6.17287] → [7.672:738]

      outfile:write(json.encode(shape))
      outfile:write('\n')

Deletion in file.lua at line 125 [6.15083]
B:BD[6.17507] → [3.598:650]
```
      outfile:write(line)
      outfile:write('\n')
```
Solving an order conflict in file.lua at line 125 [6.15083]
[7.791]
[8.289]
Deletion in file.lua at line 133 [6.15083]
B:BD[6.17771] → [3.651:703]
```
      outfile:write(line)
      outfile:write('\n')
```
Solving an order conflict in file.lua at line 133 [6.15083]
[7.844]
[6.17803]

Deletion in file.lua at line 134 [6.15083]

B:BD[6.17842] → [7.845:981]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius}))
      outfile:write('\n')

Deletion in file.lua at line 137 [6.15083]

B:BD[6.17994] → [7.982:1176]

      outfile:write(json.encode({mode=shape.mode, center=drawing.points[shape.center], radius=shape.radius, start_angle=shape.start_angle, end_angle=shape.end_angle}))
      outfile:write('\n')

Merge lines.love

Dependencies

In channels

Change contents

Deletion in source_file.lua at line 96 [5.150241]

Deletion in source_file.lua at line 102 [5.150241]

Solving an order conflict in source_file.lua at line 102 [5.150241]

Deletion in source_file.lua at line 110 [5.150241]

Solving an order conflict in source_file.lua at line 110 [5.150241]

Deletion in source_file.lua at line 111 [5.150241]

Deletion in source_file.lua at line 114 [5.150241]

Deletion in file.lua at line 119 [6.15083]

Deletion in file.lua at line 125 [6.15083]

Solving an order conflict in file.lua at line 125 [6.15083]

Deletion in file.lua at line 133 [6.15083]

Solving an order conflict in file.lua at line 133 [6.15083]

Deletion in file.lua at line 134 [6.15083]

Deletion in file.lua at line 137 [6.15083]