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

gframe/deck_con.cpp

@@ -884,8 +884,8 @@ void DeckBuilder::FilterCards() {
 			element_start++;
 		}
 		if(element_start < str.size()) {
-			element.setcode = dataManager.GetSetCode(element.keyword.c_str());
 			element.keyword = str.substr(element_start);
+			element.setcode = dataManager.GetSetCode(element.keyword.c_str());
 			query_elements.push_back(element);
 		}
 	}