Merge branch 'mc'

data/default_config.json

@@ -160,6 +160,7 @@
       "post_detailed_score": true,
       "post_score_midduel": true,
       "cache_ttl": 60000,
+      "no_match_mode": false,
       "options": {
         "apiKey": "123"
       },

ygopro-server.coffee

@@ -2564,6 +2564,8 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
         #if found.winnerId
         #  ygopro.stoc_die(client, '${challonge_match_already_finished}')
         #  return
+        create_room_name = found.id
+        if !settings.modules.challonge.no_match_mode
           create_room_name = 'M#' + found.id
         if recover_match
           create_room_name = recover_match[0] + ',' + create_room_name

ygopro-server.js

@@ -3358,7 +3358,10 @@
           //if found.winnerId
           //  ygopro.stoc_die(client, '${challonge_match_already_finished}')
           //  return
+          create_room_name = found.id;
+          if (!settings.modules.challonge.no_match_mode) {
             create_room_name = 'M#' + found.id;
+          }
           if (recover_match) {
             create_room_name = recover_match[0] + ',' + create_room_name;
           }