merge bugfix

akkartik

Dec 7, 2023, 4:59 PM

442XD5KJVHEBVDFOOL6EQJKSH26NIX2XULWNL7Q3WMF3YCICBP2AC

Dependencies

• [2] F2P336NO resolve conflicts
• [3] CC6INQTA merge quasi-bug
• [4] ULKNZUZK resolve conflicts
• [5] 36Z442IV back to commit 8123959e52f without code editing
• [*] OTIBCAUJ love2d scaffold

Change contents

• replacement in main.lua at line 18
  [2.195]→[2.195:256](∅→∅)
  − -- Mode initialized elsewhere. Available modes: run, error
  [2.195]

  [2.256]
  + -- Available modes: run, error

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

  + Mode = 'run'

  + end
• edit in main.lua at line 23
  [4.130]→[3.0:56](∅→∅),[4.130]→[3.0:56](∅→∅)
  − -- Available modes: run, version_check

  − Mode = 'run'
• resolve order conflict in main.lua at line 23
  [2.274]

  [4.130]