akkartik/sokoban.love - Change 2ZCXBDLYCXU4LDGUMEM52ROBU4T36BKVBGO42ZBVZJKJ3SOSVDCAC

Merge text.love

Created by Kartik K. Agaram on January 16, 2023

2ZCXBDLYCXU4LDGUMEM52ROBU4T36BKVBGO42ZBVZJKJ3SOSVDCAC

Dependencies

[2] 36Z442IVPXHZ7D2QI26YLN3TDDEMDRQ2GKBYQAD6NUHQZVCCY4VAC
[3] WZZLGNXE2NQFKEUD5RHXPAMP4LV6FML6EB23XNISRQMXIIFOTJ7AC
[4] KKMFQDR43ZWVCDRHQLWWX3FCWCFA3ZSXYOBRJNPHUQZR2XPKWULAC
[5] OTIBCAUJ3KDQJLVDN3A536DLZGNRYMGJLORZVR3WLCGXGO6UGO6AC
[6] EKJUHVHBISNAJ6HP2LGPSOY7RI7DVP6KFJWF2AI24EVTIMACQTIQC
[7] 75O55MGVCYMYRCU2TJ6HWBVH6ASBPMLNQTH2FGNKEBOIFMJJREJQC

In channels

main

Change contents

Insertion in main.lua at line 34 [5.2]

[4.187143]

[2.2351]

  love.window.setVSync(0)  -- simplify profiling; we're not a game

Deletion in main.lua at line 42 [5.2]

B:BD[4.187143] → [3.17:84]

BD:BD[4.187143] → [3.17:84]

∅:D[3.84] → [6.17:169]

∅:D[7.121] → [6.17:169]

B:BD[4.187143] → [6.17:169]

BD:BD[4.187143] → [6.17:169]

  love.window.setVSync(0)  -- simplify profiling; we're not a game
  love.keyboard.setTextInput(true)  -- bring up keyboard on touch screen
  love.keyboard.setKeyRepeat(true)
  love.graphics.setBackgroundColor(1,1,1)

Solving an order conflict in main.lua at line 42 [5.2]
[2.2567]
[4.187263]