resolve conflicts

akkartik

Jan 22, 2024, 4:09 PM

LT5G6MTBPXEJWU4MAOAMMZ2TTBB77IISOQ2H5PMLANKKP2MMTIJQC

Dependencies

• [2] OEZ4KAX6 Merge upstream into main
• [3] AQMZJXUR use editor state font for width calculations
• [4] UHB4GARJ left/right margin -> left/right coordinates
• [5] 7CEOB56D Merge upstream into main
• [6] P4376EXK add state arg to few functions
• [*] VHQCNMAR several more modules

Change contents

• resurrect zombie in help.lua at line 11
  [4.18664]→[2.178:206](∅→∅),[4.18664]→[2.178:206](∅→∅),[4.18762]→[2.207:235](∅→∅),[4.18762]→[2.207:235](∅→∅)
  + y = y + State.line_height

  + y = y + State.line_height
• edit in help.lua at line 12
  [2.206]

  [2.207]
  + love.graphics.print("then press the mouse button to drop it", State.left+30+State.font:getWidth('* '),y)
• edit in help.lua at line 14
  [4.460]→[3.5225:5332](∅→∅),[4.460]→[3.5225:5332](∅→∅)
  − love.graphics.print("then press the mouse button to drop it", State.left+30+State.font:getWidth('* '),y)
• resolve order conflict in help.lua at line 14
  [2.235]

  [4.18763]