Merge pull request #204 from rocco27/master

English language and xml file updates

lang/English/global.php

@@ -22,7 +22,7 @@
  *
  */
 
-define('lang_charset', "ISO");
+define('lang_charset', "UTF-8");
 define('already_logged_in_redirecting_to_dashboard', "You are already logged in, redirecting to Dashboard.");
 define('logging_in', "Logging in");
 define('redirecting_in', "Redirecting in");

lang/English/modules/config_games.php

@@ -38,6 +38,6 @@ define('select_game', "Select Game");
 define('create_xml_configs', "Create XML Configs");
 define('failed_to_delete_config_from_db', "Failed to delete %s config from database");
 define('failed_removing_file', "Falied removing the file %s.");
-define('removed_game_cfg_from_disk_and_datbase', "Removed config for %s from disk and database.");
+define('removed_game_cfg_from_disk_and_datbase', "Removed config for %s from storage and database.");
 define('delete_game_config_for', "Delete game configuration for %s from disk and database.");
 ?>

lang/English/modules/dashboard.php

@@ -23,7 +23,7 @@
  */
 
 define('dashboard_ftp_text', "The FTP client can compress files and send them via email, can uncompress too, edit text files and much more.");
-define('dashboard_addons_manager_text', "Manage all different types of services with OGP. Choose from over 70 servers supplied directly by OGP.");
+define('dashboard_addons_manager_text', "Manage all different types of services with OGP. Choose from over 115 servers, which supplied directly by OGP.");
 define('dashboard_game_monitor_text', "Watch and monitor your traffic & logs quickly. You can see what servers are up and down.");
 define('dashboard_support_text', "Get support from the OGP Professional Team on the forum. Fast response and great attention.");
 define('welcome_text', "Welcome to the Open Game Panel (OGP). OGP is an open-source software, that allows you to install, start and monitor different game servers.");

lang/English/modules/gamemanager.php

@@ -52,7 +52,7 @@ define('starting_server_settings', "Starting server with following settings");
 define('startup_params', "Startup parameters");
 define('startup_cpu', "CPU the server is running on");
 define('startup_nice', "Nice value of the server");
-define('game_home', "game server");
+define('game_home', "Home Path");
 define('server_started', "Server started successfully.");
 define('no_parameter_access', "You do not have access to parameters.");
 define('extra_parameters', "Extra Parameters");
@@ -94,7 +94,7 @@ define('no_ogp_lgsl_support', "This server (running: %s) does not have LGSL supp
 define('server_status', "Server on %s is %s.");
 define('server_stopped', "Server '%s' has been stopped.");
 define('if_want_to_start_homes', "If you want to start game servers go to %s.");
-define('view_log', "Logs");
+define('view_log', "Log Viewer");
 define('if_want_manage', "If you want to manage your games you can do it in the");
 define('columns', "columns");
 define('group_users', "Group users:");
@@ -191,11 +191,11 @@ define('auto_update_title_popup', "Steam Auto Update Link");
 define('auto_update_popup_html', "<p>Use the link below to check and automatically update your game server via Steam if needed.&nbsp; You can query it using a cronjob or manually initiate the process.</p>");
 define('auto_update_copy_me', "Copy");
 define('auto_update_copy_me_success', "Copied!");
-define('auto_update_copy_me_fail', "Failed to copy. Please manually copy the link.");
+define('auto_update_copy_me_fail', "Failed to copy. Please, manually copy the link.");
 define('get_steam_autoupdate_api_link', "Auto Update Link");
 define('update_attempt_from_nonmaster_server', "User %s attempted to update home_id %d from a non-master server. (Home ID: %d)");
 define('attempting_nonmaster_update', "You are attempting to update this server from a non-master server.");
-define('cannot_update_from_own_self', "Local Server Update may not run on a master server.");
+define('cannot_update_from_own_self', "Local server update may not run on a Master server.");
 define('show_server_id', "Show Server IDs");
 define('hide_server_id', "Hide Server IDs");
 ?>

lang/English/modules/server.php

@@ -121,7 +121,7 @@ define('ports_range_added_successfull_for', "Ports range added successfully for
 define('ports_range_deleted_successfull', "Ports range deleted successfully.");
 define('ports_range_edited_successfull_for', "Ports range edited successfully for %s.");
 define('editing_firewall_for_remote_server', "Editing Firewall for remote server named '%s'");
-define('default_allowed', "Default allowed");
+define('default_allowed', "Allowed by default");
 define('allow_port_command', "Allow port command");
 define('deny_port_command', "Deny port command");
 define('allow_ip_port_command', "Allow IP:port command");

lang/English/modules/update.php

@@ -30,7 +30,7 @@ define('dwl_complete', "Download complete");
 define('install_update', "Installing update...");
 define('update_complete', "Update complete");
 define('ignored_files', "%s ignored files.");
-define('not_updated_files_blacklisted', "Not updated/installed files (Blacklisted):<br>%s");
+define('not_updated_files_blacklisted', "Not updated/installed files (blacklisted):<br>%s");
 define('latest_version', "Latest version");
 define('panel_version', "Panel version");
 define('update_now', "Update Now");

lang/English/modules/user_games.php

@@ -25,7 +25,7 @@
 define('add_mods_note', "You need to add mods after adding server to user. This can be done by editing the server.");
 define('game_servers', "Game Servers");
 define('game_path', "Game Path");
-define('game_path_info', "An absolute server path. Example: /home/ogp/my_server/");
+define('game_path_info', "An absolute server path. Example: /home/ogpbot/OGP_User_Files/My_Server");
 define('game_server_name_info', "Server name helps users to identify their servers.");
 define('control_password', "Control password");
 define('control_password_info', "This password is used for server control, such as RCON password. If the password is empty then other means are used.");
@@ -129,8 +129,8 @@ define('available_game_homes', "Available game servers");
 define('home_id', "Home ID");
 define('game_server', "Game Server");
 define('game_type', "Game Type");
-define('game_home', "game server");
-define('game_home_name', "game server Name");
+define('game_home', "Home Path");
+define('game_home_name', "Game Server Name");
 define('clone', "Clone");
 define('unassign', "Unassign");
 define('access_rights', "Access Rights");
@@ -192,7 +192,7 @@ define('failed_to_remove_ftp_account_from_remote_server', "Failed to remove FTP
 define('remove_it_anyway', "Would you like to remove it anyway?");
 define('sucessfully_deleted', "Sucessfully deleted %s");
 define('the_agent_had_a_problem_deleting', "The agent had a problem deleting %s, check the agent log");
-define('connection_timeout_or_problems_reaching_the_agent', "Connection timeout or problems reaching the agent");
+define('connection_timeout_or_problems_reaching_the_agent', "Connection timeout or problems with reaching the Agent");
 define('does_not_exist_yet', "Does not exist yet.");
 define('go_to_custom_fields', "Go to Custom Fields");
 define('back_to_edit_server', "Back to edit server");

modules/config_games/server_configs/bukkit_linux32.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>bukkit_linux32</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Bukkit</game_name>
+  <server_exec_name>craftbukkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar craftbukkit.jar nogui</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="bukkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/bukkit_linux64.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>bukkit_linux64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Bukkit</game_name>
+  <server_exec_name>craftbukkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar craftbukkit.jar nogui -d64</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="bukkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/bukkit_win32.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>bukkit_win32</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Bukkit</game_name>
+  <server_exec_name>craftbukkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar craftbukkit.jar nogui</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="bukkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/bukkit_win64.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>bukkit_win64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Bukkit</game_name>
+  <server_exec_name>craftbukkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar craftbukkit.jar nogui -d64</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="bukkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/minecraft_bukkit.xml

@@ -1,80 +0,0 @@
-<game_config>
-  <game_key>minecraft_bukkit_linux32</game_key>
-  <protocol>gameq</protocol>
-  <gameq_query_name>minecraft</gameq_query_name>
-  <game_name>Minecraft Bukkit</game_name>
-  <server_exec_name>craftbukkit.jar</server_exec_name>
-  <cli_template>java %XMS% %XMX% -jar craftbukkit.jar nogui</cli_template>
-  <console_log>server.log</console_log>
-  <max_user_amount>32</max_user_amount>
-  <!-- <control_protocol>lcon</control_protocol> Enables legacy console, the output will be shown in the log file-->
-  <mods>
-    <mod key="none">
-      <name>none</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="ip">
-	  <default>server-ip=.*</default>
-	  <var>server-ip=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>server-port=.*</default>
-	  <var>server-port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="max_players">
-	  <default>max-players=.*</default>
-	  <var>max-players=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-query=.*</default>
-	  <var>enable-query=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>query.port=.*</default>
-	  <var>query.port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-rcon=.*</default>
-	  <var>enable-rcon=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="control_password">
-	  <default>rcon.password=.*</default>
-	  <var>rcon.password=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="home_name">
-	  <default>motd=.*</default>
-	  <var>motd=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-  </replace_texts>
-  <server_params>
-	<param id="XMS" key="-Xms" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Start RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-	<param id="XMX" key="-Xmx" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Max RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-  </server_params>
-</game_config>

modules/config_games/server_configs/minecraft_bukkit_win.xml

@@ -1,79 +0,0 @@
-<game_config>
-  <game_key>minecraft_bukkit_win32</game_key>
-  <protocol>gameq</protocol>
-  <gameq_query_name>minecraft</gameq_query_name>
-  <game_name>Minecraft Bukkit</game_name>
-  <server_exec_name>craftbukkit.jar</server_exec_name>
-  <cli_template>java %XMS% %XMX% -jar craftbukkit.jar nogui</cli_template>
-  <console_log>server.log</console_log>
-  <max_user_amount>32</max_user_amount>
-  <mods>
-    <mod key="none">
-      <name>none</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="ip">
-	  <default>server-ip=.*</default>
-	  <var>server-ip=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>server-port=.*</default>
-	  <var>server-port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="max_players">
-	  <default>max-players=.*</default>
-	  <var>max-players=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-query=.*</default>
-	  <var>enable-query=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>query.port=.*</default>
-	  <var>query.port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-rcon=.*</default>
-	  <var>enable-rcon=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="control_password">
-	  <default>rcon.password=.*</default>
-	  <var>rcon.password=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="home_name">
-	  <default>motd=.*</default>
-	  <var>motd=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-  </replace_texts>
-  <server_params>
-	<param id="XMS" key="-Xms" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Start RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-	<param id="XMX" key="-Xmx" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Max RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-  </server_params>
-</game_config>

modules/config_games/server_configs/minecraft_linux32.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>minecraft_linux32</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Minecraft</game_name>
+  <server_exec_name>minecraft_server.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar minecraft_server.jar nogui</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/minecraft_linux64.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>minecraft_linux64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Minecraft</game_name>
+  <server_exec_name>minecraft_server.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar minecraft_server.jar nogui -d64</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/minecraft_server.xml

@@ -1,80 +0,0 @@
-<game_config>
-  <game_key>minecraft_linux32</game_key>
-  <protocol>gameq</protocol>
-  <gameq_query_name>minecraft</gameq_query_name>
-  <game_name>Minecraft Server</game_name>
-  <server_exec_name>minecraft_server.jar</server_exec_name>
-  <cli_template>java %XMS% %XMX% -jar minecraft_server.jar nogui</cli_template>
-  <console_log>logs/latest.log</console_log>
-  <max_user_amount>32</max_user_amount>
-  <!-- <control_protocol>lcon</control_protocol> Enables legacy console, the output will be shown in the log file-->
-  <mods>
-    <mod key="none">
-      <name>none</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="ip">
-	  <default>server-ip=.*</default>
-	  <var>server-ip=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>server-port=.*</default>
-	  <var>server-port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="max_players">
-	  <default>max-players=.*</default>
-	  <var>max-players=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-query=.*</default>
-	  <var>enable-query=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>query.port=.*</default>
-	  <var>query.port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-rcon=.*</default>
-	  <var>enable-rcon=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="control_password">
-	  <default>rcon.password=.*</default>
-	  <var>rcon.password=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="home_name">
-	  <default>motd=.*</default>
-	  <var>motd=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-  </replace_texts>
-  <server_params>
-	<param id="XMS" key="-Xms" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Start RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-	<param id="XMX" key="-Xmx" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Max RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-  </server_params>
-</game_config>

modules/config_games/server_configs/minecraft_server_win.xml

@@ -1,79 +0,0 @@
-<game_config>
-  <game_key>minecraft_win32</game_key>
-  <protocol>gameq</protocol>
-  <gameq_query_name>minecraft</gameq_query_name>
-  <game_name>Minecraft Server</game_name>
-  <server_exec_name>minecraft_server.jar</server_exec_name>
-  <cli_template>java %XMS% %XMX% -jar minecraft_server.jar nogui</cli_template>
-  <console_log>logs/latest.log</console_log>
-  <max_user_amount>32</max_user_amount>
-  <mods>
-    <mod key="none">
-      <name>none</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="ip">
-	  <default>server-ip=.*</default>
-	  <var>server-ip=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>server-port=.*</default>
-	  <var>server-port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="max_players">
-	  <default>max-players=.*</default>
-	  <var>max-players=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-query=.*</default>
-	  <var>enable-query=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="port">
-	  <default>query.port=.*</default>
-	  <var>query.port=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="true">
-	  <default>enable-rcon=.*</default>
-	  <var>enable-rcon=true</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="control_password">
-	  <default>rcon.password=.*</default>
-	  <var>rcon.password=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-	<text key="home_name">
-	  <default>motd=.*</default>
-	  <var>motd=</var>
-	  <filepath>server.properties</filepath>
-	  <options></options>
-	</text>
-  </replace_texts>
-  <server_params>
-	<param id="XMS" key="-Xms" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Start RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-	<param id="XMX" key="-Xmx" type="text">
-	  <option>ns</option>
-      <default>1024M</default>
-      <caption>Max RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-  </server_params>
-</game_config>

modules/config_games/server_configs/minecraft_tekkit.xml

@@ -1,80 +0,0 @@
-<game_config>
-  <game_key>minecraft_tekkit_linux32</game_key>
-  <protocol>gameq</protocol>
-  <gameq_query_name>minecraft</gameq_query_name>
-  <game_name>Minecraft Tekkit</game_name>
-  <server_exec_name>Tekkit.jar</server_exec_name>
-  <cli_template>java %XMS% %XMX% -jar Tekkit.jar nogui</cli_template>
-  <console_log>server.log</console_log>
-  <max_user_amount>32</max_user_amount>
-  <!-- <control_protocol>lcon</control_protocol> Enables legacy console, the output will be shown in the log file-->
-  <mods>
-    <mod key="none">
-      <name>none</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="ip">
-     <default>server-ip=.*</default>
-     <var>server-ip=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="port">
-     <default>server-port=.*</default>
-     <var>server-port=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="max_players">
-     <default>max-players=.*</default>
-     <var>max-players=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="true">
-     <default>enable-query=.*</default>
-     <var>enable-query=true</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="port">
-     <default>query.port=.*</default>
-     <var>query.port=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="true">
-     <default>enable-rcon=.*</default>
-     <var>enable-rcon=true</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="control_password">
-     <default>rcon.password=.*</default>
-     <var>rcon.password=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="home_name">
-     <default>motd=.*</default>
-     <var>motd=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-  </replace_texts>
-  <server_params>
-   <param id="XMS" key="-Xms" type="text">
-     <option>ns</option>
-      <default>1024M</default>
-      <caption>Start RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-   <param id="XMX" key="-Xmx" type="text">
-     <option>ns</option>
-      <default>1024M</default>
-      <caption>Max RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-  </server_params>
-</game_config>

modules/config_games/server_configs/minecraft_tekkit_win.xml

@@ -1,79 +0,0 @@
-<game_config>
-  <game_key>minecraft_tekkit_win32</game_key>
-  <protocol>gameq</protocol>
-  <gameq_query_name>minecraft</gameq_query_name>
-  <game_name>Minecraft Tekkit</game_name>
-  <server_exec_name>Tekkit.jar</server_exec_name>
-  <cli_template>java %XMS% %XMX% -jar Tekkit.jar nogui</cli_template>
-  <console_log>server.log</console_log>
-  <max_user_amount>32</max_user_amount>
-  <mods>
-    <mod key="none">
-      <name>none</name>
-    </mod>
-  </mods>
-  <replace_texts>
-    <text key="ip">
-     <default>server-ip=.*</default>
-     <var>server-ip=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="port">
-     <default>server-port=.*</default>
-     <var>server-port=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="max_players">
-     <default>max-players=.*</default>
-     <var>max-players=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="true">
-     <default>enable-query=.*</default>
-     <var>enable-query=true</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="port">
-     <default>query.port=.*</default>
-     <var>query.port=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="true">
-     <default>enable-rcon=.*</default>
-     <var>enable-rcon=true</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="control_password">
-     <default>rcon.password=.*</default>
-     <var>rcon.password=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-   <text key="home_name">
-     <default>motd=.*</default>
-     <var>motd=</var>
-     <filepath>server.properties</filepath>
-     <options></options>
-   </text>
-  </replace_texts>
-  <server_params>
-   <param id="XMS" key="-Xms" type="text">
-     <option>ns</option>
-      <default>1024M</default>
-      <caption>Start RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-   <param id="XMX" key="-Xmx" type="text">
-     <option>ns</option>
-      <default>1024M</default>
-      <caption>Max RAM</caption>
-      <desc>How much memory? for example: 1024M</desc>
-    </param>
-  </server_params>
-</game_config>

modules/config_games/server_configs/minecraft_win32.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>minecraft_win32</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Minecraft</game_name>
+  <server_exec_name>minecraft_server.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar minecraft_server.jar nogui</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/minecraft_win64.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>minecraft_win64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Minecraft</game_name>
+  <server_exec_name>minecraft_server.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar minecraft_server.jar nogui -d64</cli_template>
+  <console_log>logs/latest.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="default">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/squad_linux64.xml

@@ -28,31 +28,26 @@
       <default>ServerName=.*</default>
       <var>ServerName=</var>
       <filepath>Squad/ServerConfig/Server.cfg</filepath>
-      <options></options>
     </text>
     <text key="max_players">
       <default>MaxPlayers=.*</default>
       <var>MaxPlayers=</var>
       <filepath>Squad/ServerConfig/Server.cfg</filepath>
-      <options></options>
     </text>
     <text key="ip">
       <default>Ip=.*</default>
       <var>Ip=</var>
       <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
-      <options></options>
     </text>
     <text key="control_password">
       <default>Password=.*</default>
       <var>Password=</var>
       <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
-      <options></options>
     </text>
   </replace_texts>
   <server_params>
   <param key="FIXEDMAXTICKRATE=" type="text" id="TICKRATE">
       <default>50</default>
-      <caption></caption>
       <desc>MAX server tickrate.</desc>
       <options>ns</options>
     </param>
@@ -60,7 +55,6 @@
       <option value="ALWAYS">Always</option>
       <option value="FIRST">First</option>
       <option value="NONE">None</option>
-      <caption></caption>
       <desc>Randomize map rotation.</desc>
       <options>ns</options>
     </param>
@@ -71,8 +65,7 @@
       <default_value>21114</default_value>
       <var>Port=</var>
       <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
-      <options></options>
-      <desc></desc>
+      <desc>Sets the port to RCON.</desc>
     </field>
   </custom_fields>
   <post_install>

modules/config_games/server_configs/squad_win64.xml

@@ -28,31 +28,26 @@
       <default>ServerName=.*</default>
       <var>ServerName=</var>
       <filepath>Squad/ServerConfig/Server.cfg</filepath>
-      <options></options>
     </text>
     <text key="max_players">
       <default>MaxPlayers=.*</default>
       <var>MaxPlayers=</var>
       <filepath>Squad/ServerConfig/Server.cfg</filepath>
-      <options></options>
     </text>
     <text key="ip">
       <default>Ip=.*</default>
       <var>Ip=</var>
       <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
-      <options></options>
     </text>
     <text key="control_password">
       <default>Password=.*</default>
       <var>Password=</var>
       <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
-      <options></options>
     </text>
   </replace_texts>
   <server_params>
   <param key="FIXEDMAXTICKRATE=" type="text" id="TICKRATE">
       <default>50</default>
-      <caption></caption>
       <desc>MAX server tickrate.</desc>
       <options>ns</options>
     </param>
@@ -60,7 +55,6 @@
       <option value="ALWAYS">Always</option>
       <option value="FIRST">First</option>
       <option value="NONE">None</option>
-      <caption></caption>
       <desc>Randomize map rotation.</desc>
       <options>ns</options>
     </param>
@@ -71,8 +65,7 @@
       <default_value>21114</default_value>
       <var>Port=</var>
       <filepath>Squad/ServerConfig/Rcon.cfg</filepath>
-      <options></options>
-      <desc></desc>
+      <desc>Sets the port to RCON.</desc>
     </field>
   </custom_fields>
   <post_install>

modules/config_games/server_configs/tekkit_linux32.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>tekkit_linux32</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Tekkit</game_name>
+  <server_exec_name>Tekkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar Tekkit.jar nogui</cli_template>
+  <console_log>server.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="tekkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/tekkit_linux64.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>tekkit_linux64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Tekkit</game_name>
+  <server_exec_name>Tekkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar Tekkit.jar nogui -d64</cli_template>
+  <console_log>server.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="tekkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/tekkit_win32.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>tekkit_win32</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Tekkit</game_name>
+  <server_exec_name>Tekkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar Tekkit.jar nogui</cli_template>
+  <console_log>server.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="tekkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/config_games/server_configs/tekkit_win64.xml

@@ -0,0 +1,83 @@
+<game_config>
+  <game_key>tekkit_win64</game_key>
+  <protocol>gameq</protocol>
+  <gameq_query_name>minecraft</gameq_query_name>
+  <game_name>Tekkit</game_name>
+  <server_exec_name>Tekkit.jar</server_exec_name>
+  <query_port type="add">1</query_port>
+  <cli_template>java %XMS% %XMX% -jar Tekkit.jar nogui -d64</cli_template>
+  <console_log>server.log</console_log>
+  <max_user_amount>250</max_user_amount>
+  <mods>
+    <mod key="tekkit">
+      <name>None</name>
+    </mod>
+  </mods>
+  <replace_texts>
+    <text key="ip">
+      <default>server-ip=.*</default>
+      <var>server-ip=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="port">
+      <default>server-port=.*</default>
+      <var>server-port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="true">
+      <default>enable-query=.*</default>
+      <var>enable-query=true</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="query_port">
+      <default>query.port=.*</default>
+      <var>query.port=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="max_players">
+      <default>max-players=.*</default>
+      <var>max-players=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="control_password">
+      <default>rcon.password=.*</default>
+      <var>rcon.password=</var>
+      <filepath>server.properties</filepath>
+    </text>
+    <text key="home_name">
+      <default>motd=.*</default>
+      <var>motd=</var>
+      <filepath>server.properties</filepath>
+    </text>
+  </replace_texts>
+  <server_params>
+  <param key="-Xms" type="text" id="XMS">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Initial memory size for Java can be specified.</desc>
+    </param>
+    <param key="-Xmx" type="text" id="XMX">
+      <option>ns</option>
+      <default>1024M</default>
+      <desc>Maximum memory size for Java can be specified.</desc>
+    </param>
+  </server_params>
+  <custom_fields>
+    <field key="RCON Enabled" type="select">
+      <option value="true">Yes</option>
+      <option value="false">No</option>
+      <default>enable-rcon=.*</default>
+      <default_value>true</default_value>
+      <var>enable-rcon=</var>
+      <filepath>server.properties</filepath>
+      <desc>Enables remote access to the server console.</desc>
+    </field>
+    <field key="RCON Port" type="text">
+      <default>rcon.port=.*</default>
+      <default_value>25575</default_value>
+      <var>rcon.port=</var>
+      <filepath>server.properties</filepath>
+      <desc>Sets the port to RCON.</desc>
+    </field>
+  </custom_fields>
+</game_config>

modules/gamemanager/rsync_install.php

@@ -151,10 +151,10 @@ function exec_ogp_module() {
 		$lgslname = $server_xml->gameq_query_name;
 		if($lgslname == "minecraft")
 		{
-			if($server_xml->game_name == "Minecraft Tekkit")
-				$lgslname = "tekkit";
-			elseif($server_xml->game_name == "Minecraft Bukkit")
+			if($server_xml->game_name == "Bukkit")
 				$lgslname = "bukkit";
+			elseif($server_xml->game_name == "Tekkit")
+				$lgslname = "tekkit";
 		}
 	}
 	elseif( isset($server_xml->protocol) )

modules/gamemanager/server_monitor.php

@@ -102,10 +102,10 @@ function get_sync_name($server_xml)
 		$sync_name = $server_xml->gameq_query_name;
 		if($sync_name == "minecraft")
 		{
-			if($server_xml->game_name == "Minecraft Tekkit")
-				$sync_name = "tekkit";
-			elseif($server_xml->game_name == "Minecraft Bukkit")
+			if($server_xml->game_name == "Bukkit")
 				$sync_name = "bukkit";
+			elseif($server_xml->game_name == "Tekkit")
+				$sync_name = "tekkit";
 		}
 	}
 	elseif( isset($server_xml->protocol) )