resolve conflicts

akkartik

Dec 7, 2023, 8:54 AM

DKDZZ6VUJ5TBSFABJKP2ZILINAB6BCQWITNW6V2PW36MCADVSE3AC

Dependencies

• [2] FURE4NRM bugfix: LÖVE v12 is not supported yet on mobile devices
• [3] F2P336NO resolve conflicts
• [4] PJ5PQAQE record support for multiple versions
• [5] QRUFNFPP Merge text0
• [6] T7QIIGQ6 attempt at better error recovery
• [7] 36Z442IV back to commit 8123959e52f without code editing
• [8] B5SFL7HP Merge text0
• [9] ULKNZUZK resolve conflicts
• [10] SDRXK4X5 move
• [11] XSKVRP2S resolve conflicts
• [*] OTIBCAUJ love2d scaffold

Change contents

• edit in main.lua at line 17
  [4.161]→[2.10:120](∅→∅),[4.161]→[2.10:120](∅→∅)
  − Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0'} -- put the recommended version first
• replacement in main.lua at line 19
  [4.2139]→[3.77:195](∅→∅)
  − Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0', '12.0'} -- put the recommended version first
  [4.2139]

  [3.195]
  + Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0'} -- put the recommended version first