resolve conflicts

akkartik

Dec 3, 2023, 8:53 PM

TG3DFQG5NGMWZSPINT2TFSGBRRUKGRAC3S3RM4CGE3Q7Y4457Z4QC

Dependencies

• [2] 2SAJWSNK automatically insert timestamp every time
• [3] EGEOHXM6 Merge lines.love
• [4] L7YY2MW3 resolve conflicts
• [5] OLH6DPAD speculatively recommend new LÖVE v11.5 in all forks
• [6] FE25XVZY yet another bugfix to the version check
• [7] TSK2OXU2 .
• [8] 57OGXVHZ Merge lines.love
• [9] 6VJTQKW7 start supporting LÖVE v12
• [10] 7OVYFH6I Merge lines.love
• [11] KKMFQDR4 editing source code from within the app
• [12] 5XQ4Y7NU reorg manual tests doc
• [*] OTIBCAUJ love2d scaffold
• [*] BJ5X5O4A let's prevent the text cursor from ever getting on a drawing

Change contents

• replacement in main.lua at line 80
  [3.198]→[3.198:282](∅→∅)
  − local supported_versions = {'11.4', '12.0'} -- put the recommended version first
  [3.198]

  [3.282]
  + local supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first
• edit in main.lua at line 90
  [7.437]→[4.59:59](∅→∅),[7.198]→[5.20:112](∅→∅),[7.198]→[5.20:112](∅→∅)
  −

  − local supported_versions = {'11.5', '11.4', '12.0'} -- put the recommended version first
• resolve order conflict in main.lua at line 90
  [7.437]

  [7.186725]
• edit in Manual_tests.md at line 32
  [7.211526]

  [7.907]
  + * 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.
• edit in Manual_tests.md at line 37
  [7.211526]→[6.23:238](∅→∅)
  − * 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.
• resolve order conflict in Manual_tests.md at line 37
  [2.328]

  [7.211526]