resolve conflicts

akkartik

Dec 7, 2023, 5:08 PM

27JP3RRTNRO2E2NDZEACSQ25T2B53JBGYWJ5REP5J7GGO4VN3ZJQC

Dependencies

• [2] DKDZZ6VU resolve conflicts
• [3] 442XD5KJ merge bugfix
• [4] QRUFNFPP Merge text0
• [5] ULKNZUZK resolve conflicts
• [6] SDRXK4X5 move
• [7] F2P336NO resolve conflicts
• [8] PJ5PQAQE record support for multiple versions
• [9] 36Z442IV back to commit 8123959e52f without code editing
• [*] OTIBCAUJ love2d scaffold

Change contents

• resurrect zombie in main.lua at line 19
  [4.2139]→[2.10:120](∅→∅),[4.2139]→[2.10:120](∅→∅)
  + Supported_versions = {'11.5', '11.4', '11.3', '11.2', '11.1', '11.0'} -- put the recommended version first
• resurrect zombie in main.lua at line 20
  [4.195]→[3.0:128](∅→∅),[4.195]→[3.0:128](∅→∅)
  + -- Available modes: run, error

  + if Mode == nil then -- might have already been initialized elsewhere

  + Mode = 'run'

  + end
• resolve order conflict in main.lua at line 20
  [2.120]

  [3.0]