merge

gframe/game.cpp

@@ -18,7 +18,7 @@
 #include <regex>
 #endif //YGOPRO_SERVER_MODE
 
-unsigned short PRO_VERSION = 0x1347;
+unsigned short PRO_VERSION = 0x1348;
 
 namespace ygo {
 

ocgcore @ dfbe6b22

-Subproject commit 9b9aecd333d4ba49d6d32e7992fe8085a887b37e
+Subproject commit dfbe6b2219c60c337c11cac74c740ab845a18fba

premake/gframe/ygopro.rc

 1 ICON "ygopro.ico"
 
 1 VERSIONINFO
-FILEVERSION 1, 0, 34, 7
-PRODUCTVERSION 1, 0, 34, 7
+FILEVERSION 1, 0, 34, 8
+PRODUCTVERSION 1, 0, 34, 8
 FILEOS 0x4
 FILETYPE 0x1
 
@@ -16,8 +16,8 @@ VALUE "InternalName", "YGOPRO Server Mode"
 VALUE "LegalCopyright", "Copyright (C) 2018 Nanahira"
 VALUE "OriginalFilename", "ygopro.exe"
 VALUE "ProductName", "YGOPRO Server Mode"
-VALUE "FileVersion", "1.034.7.Koishi"
-VALUE "ProductVersion", "1.034.7.Koishi"
+VALUE "FileVersion", "1.034.8.Koishi"
+VALUE "ProductVersion", "1.034.8.Koishi"
 END
 END
 BLOCK "VarFileInfo"

script @ 9845ffd0

-Subproject commit b43ed108d925814ece95ea5fd170457f1ac1a04f
+Subproject commit 9845ffd083503c65aed5b4660b3eb0c49b173fce

strings.conf

@@ -755,7 +755,7 @@
 !setname 0x82 怒怒怒	ドドド
 !setname 0x83 机关傀儡	ギミック・パペット
 !setname 0x84 燃烧拳击手	BK（バーニングナックラー）
-!setname 0x85 超级防御机器人	SDロボ
+!setname 0x85 超级防卫机器人	SDロボ
 !setname 0x86 光天使
 !setname 0x87 阴影	アンブラル
 !setname 0x88 武神
@@ -833,6 +833,7 @@
 !setname 0xbf 灵使	霊使い
 !setname 0xc0 凭依装着	憑依装着
 !setname 0xc1 PSY骨架	PSYフレーム
+!setname 0x10c1 PSY骨架装备	PSYフレームギア
 !setname 0xc2 动力工具	パワー・ツール
 !setname 0xc3 锋利小鬼	エッジインプ
 !setname 0xc4 神数	セフィラ

system.conf

@@ -2,7 +2,7 @@
 #nickname & gamename should be less than 20 characters
 use_d3d = 0
 use_image_scale = 1
-pro_version = 4935
+pro_version = 4936
 antialias = 2
 errorlog = 3
 nickname = Komeiji Koishi