Merge branch 'master' into server

.gitlab-ci.yml

@@ -122,9 +122,7 @@ upload_to_minio:
     - exec_windows
   tags: 
     - linux
-  image: python
   script:
-    - pip install -U -i https://mirrors.aliyun.com/pypi/simple/ awscli
     - aws s3 --endpoint=https://minio.mycard.moe:9000 cp ygopro.exe s3://mycard/koishipro/server/ygopro.exe
   only:
     - server

gframe/game.cpp

@@ -209,7 +209,7 @@ bool Game::Initialize() {
 	SetWindowsIcon();
 	//main menu
 	wchar_t strbuf[256];
-	myswprintf(strbuf, L"KoishiPro %X.0%X.%X FunFunFun", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
+	myswprintf(strbuf, L"KoishiPro %X.0%X.%X Mikobako", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
 	wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
 	wMainMenu->getCloseButton()->setVisible(false);
 	btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));

ocgcore @ 4fce02f2

-Subproject commit 6eba9f1b18f013eb28c0a7b5cc8611d0cfbc21e3
+Subproject commit 4fce02f2c2889645af14f62f198322f18d19f17a

script @ 7bd080fc

-Subproject commit eeb867bbcdfed8a128817761f0902194603f647b
+Subproject commit 7bd080fcfdf68abcd7f904fb8453d6ea4d02ba07

strings.conf

@@ -639,6 +639,7 @@
 !counter 0x5b 指示物（北极天熊北斗星）
 !counter 0x105c 燃烧指示物
 !counter 0x5d 指示物（机巧传-神使记纪图）
+!counter 0x5e 皇之键指示物
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1107,3 +1108,6 @@
 !setname 0x166 军贯	軍貫
 !setname 0x1167 森之圣兽	森の聖獣
 !setname 0x2167 森之圣灵	森の聖霊
+!setname 0x168 隐形水母怪	ステルス・クラーゲン
+!setname 0x169 原数天灵	ヌメロニアス
+!setname 0x16a 编号系	ナンバーズ