Merge upstream into main

[?]
Jul 1, 2022, 7:32 PM
4447N732DNCNIMDDBCOQN2LUUQ6LILPXTUBHVUK42UX34VEC3B6QC

Dependencies

  • [2] OEUU62GM Merge upstream into main
  • [3] DWZK32YD include CWD when saving filename
  • [4] VUVH2XLF Merge upstream into main
  • [5] 23DEB6JL make sure to save right when quitting
  • [6] VIU2FBNV make sure to save right when quitting
  • [7] KVHUFUFV reorg
  • [8] 7M7LS7I2 start saving some settings to disk on quit
  • [9] AVTNUQYR basic test-enabled framework
  • [10] AM42E4Y6 avoid redundant writes on exit
  • [*] OTIBCAUJ love2d scaffold

Change contents

  • edit in main.lua at line 326
    [2.251][2.251:396](),[2.396][4.1874:1879](),[4.68][4.1874:1879]()
    font_height=Font_height, filename=Filename, screen_top=Screen_top1, cursor=Cursor1}
    love.filesystem.write('config', json.encode(settings))
    end
  • resurrect zombie in main.lua at line 326
    [4.251][3.8:184](),[4.251][3.8:184]()
    font_height=Font_height,
    filename=love.filesystem.getWorkingDirectory()..'/'..Filename, -- '/' should work even on Windows
    screen_top=Screen_top1, cursor=Cursor1}
  • resolve order conflict in main.lua at line 326
    [2.251]
    [3.8]
  • edit in main.lua at line 329
    [3.184]
    [4.1399]
    love.filesystem.write('config', json.encode(settings))
    end