Merge branch 'master' of github.com:Fluorohydride/ygopro into develop

# Conflicts:
#	gframe/data_manager.cpp
#	gframe/deck_con.cpp
10 jobs for develop in 6 minutes and 40 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Prepare
passed #238425
linux
mat_common

00:00:32

passed #238427
linux
mat_macos

00:00:13

passed #238426
linux
mat_submodules

00:00:32

passed #238428
linux
mat_windows

00:00:13

 
  Build
passed #238430
avx2
exec_linux

00:00:57

passed #238431
arm
exec_linuxarm

00:05:27

passed #238433
macos-m1
exec_macos_platform_m1

00:01:16

passed #238432
macos
exec_macos_platform_x86

00:02:46

passed #238429
vs
exec_windows

00:04:25

 
  Combine
passed #238434
macos
exec_macos

00:00:04