Skip to content

Commit

Permalink
Replace usages of 'fCraft' in a few messages with 'ProCraft'
Browse files Browse the repository at this point in the history
  • Loading branch information
UnknownShadow200 committed Jul 25, 2017
1 parent 6b5a7de commit b1e1808
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion ConfigGUI/DeleteRankPopup.resx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</resheader>
<data name="lWarning.Text" xml:space="preserve">
<value>To preserve compatibility with older files (player database, world/zone permissions,
etc) it is recommended that you specify a substitute rank. This will allow fCraft to
etc) it is recommended that you specify a substitute rank. This will allow ProCraft to
convert all references to the "{0}" rank to the specified still-existing rank.</value>
</data>
</root>
2 changes: 1 addition & 1 deletion ConfigGUI/KeywordPicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public sealed partial class KeywordPicker : Form {
new KeywordInfo("{PLAYERS}", "Number of players online", "Note that hidden players will not be included in this number." ),
new KeywordInfo("{WORLDS}", "Number of worlds", "Number of worlds accessible by the player. Does not count hidden worlds." ),
new KeywordInfo("{MOTD}", "MOTD", "Message-of-the-day (server subtitle), as specified in config." ),
new KeywordInfo("{VERSION}", "ProCraft version", "Version of fCraft that this server is running." ),
new KeywordInfo("{VERSION}", "ProCraft version", "Version of ProCraft that this server is running." ),
new KeywordInfo("{PLAYER_LIST}", "Player list", "List of names of all online players that this player can see, including prefixes and colors (if applicable)." )
};

Expand Down
2 changes: 1 addition & 1 deletion ServerCLI/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ static class Program {
Console.CancelKeyPress += OnCancelKeyPress;

if( Server.StartServer() ) {
Console.WriteLine( "** Running fCraft version {0}. **", Updater.CurrentRelease.VersionString );
Console.WriteLine( "** Running ProCraft version {0}. **", Updater.CurrentRelease.VersionString );
Console.WriteLine( "** Server is now ready. Type /Shutdown to exit safely. **" );

while( !Server.IsShuttingDown ) {
Expand Down
2 changes: 1 addition & 1 deletion ServerCLI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle( "ProCraft ServerCLI" )]
[assembly: AssemblyDescription( "Command-line frontend for fCraft server" )]
[assembly: AssemblyDescription( "Command-line frontend for ProCraft server" )]
[assembly: AssemblyConfiguration( "" )]
[assembly: AssemblyCompany("123DMWM.tk")]
[assembly: AssemblyProduct( "ProCraft ServerCLI" )]
Expand Down
2 changes: 1 addition & 1 deletion ServerGUI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle( "ProCraft ServerGUI" )]
[assembly: AssemblyDescription( "Graphical frontend for fCraft server" )]
[assembly: AssemblyDescription( "Graphical frontend for ProCraft server" )]
[assembly: AssemblyConfiguration( "" )]
[assembly: AssemblyCompany("123DMWM.tk")]
[assembly: AssemblyProduct( "ProCraft ServerGUI" )]
Expand Down
14 changes: 7 additions & 7 deletions fCraft/System/ConfigKey.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public enum ConfigKey {


[IntKey( ConfigSection.General, 25565,
@"Port number on your local machine that fCraft uses to listen for
@"Port number on your local machine that ProCraft uses to listen for
incoming connections. If you are behind a router, you may need
to set up port forwarding. You may also need to add a firewall
exception for ServerGUI/ServerCLI/ConfigGUI. Note that your
Expand Down Expand Up @@ -306,7 +306,7 @@ public enum ConfigKey {
DefaultBackupInterval,

[IntKey( ConfigSection.SavingAndBackup, 0,
@"Maximum number of backup files that fCraft should keep.
@"Maximum number of backup files that ProCraft should keep.
If exceeded, oldest backups will be deleted first.",
MinValue = 0 )]
MaxBackups,
Expand Down Expand Up @@ -348,7 +348,7 @@ public enum ConfigKey {
IRCBotEnabled,

[StringKey( ConfigSection.IRC, "MinecraftBot",
@"IRC bot's nickname. If the nickname is taken, fCraft will append
@"IRC bot's nickname. If the nickname is taken, ProCraft will append
an underscore (_) to the name and retry.",
MinLength = 1, MaxLength = 32 )]
IRCBotNick,
Expand Down Expand Up @@ -487,8 +487,8 @@ public enum ConfigKey {
NoPartialPositionUpdates,

[EnumKey( ConfigSection.Advanced, ProcessPriorityClass.Normal,
@"It is recommended to leave fCraft at default priority.
Setting this below ""Normal"" may starve fCraft of resources.
@"It is recommended to leave ProCraft at default priority.
Setting this below ""Normal"" may starve ProCraft of resources.
Setting this above ""Normal"" may slow down other software on your machine." )]
ProcessPriority,

Expand All @@ -501,7 +501,7 @@ public enum ConfigKey {
BlockUpdateThrottling,

[IntKey( ConfigSection.Advanced, 100,
@"The rate at which fCraft applies block updates, in milliseconds. Lowering this will slightly
@"The rate at which ProCraft applies block updates, in milliseconds. Lowering this will slightly
reduce bandwidth and CPU use, but will add latency to block placement.",
MinValue = 10, MaxValue = 10000 )]
TickInterval,
Expand Down Expand Up @@ -549,7 +549,7 @@ public enum ConfigKey {
[IPKey( ConfigSection.Advanced, IPKeyAttribute.BlankValueMeaning.Any,
@"If the machine has more than one available IP address (for example
if you have more than one NIC) you can use this setting to make
fCraft bind to the same IP every time." )]
ProCraft bind to the same IP every time." )]
IP,

[EnumKey( ConfigSection.Advanced, fCraft.BandwidthUseMode.Normal,
Expand Down
6 changes: 3 additions & 3 deletions fCraft/System/Logger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public static class Logger {

} else if( ex is UnauthorizedAccessException ) {
message = "ProCraft was blocked from accessing a file or resource. " +
"Make sure that correct permissions are set for the fCraft files, folders, and processes.";
"Make sure that correct permissions are set for the ProCraft files, folders, and processes.";
return true;

} else if( ex is OutOfMemoryException ) {
Expand All @@ -239,12 +239,12 @@ public static class Logger {
return true;

} else if( ex is InvalidOperationException && ex.StackTrace.Contains( "MD5CryptoServiceProvider" ) ) {
message = "Some Windows settings are preventing fCraft from doing player name verification. " +
message = "Some Windows settings are preventing ProCraft from doing player name verification. " +
"See http://support.microsoft.com/kb/811833";
return true;

} else if( ex.StackTrace.Contains( "__Error.WinIOError" ) ) {
message = "A filesystem-related error has occurred. Make sure that only one instance of fCraft is running, " +
message = "A filesystem-related error has occurred. Make sure that only one instance of ProCraft is running, " +
"and that no other processes are using server's files or directories.";
return true;

Expand Down
2 changes: 1 addition & 1 deletion fCraft/System/Server.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ static void CheckIdles(SchedulerTask task)
string backupFileName = String.Format( Paths.DataBackupFileNameFormat, DateTime.Now ); // localized
backupFileName = Path.Combine( Paths.DataBackupDirectory, backupFileName );
using( FileStream fs = File.Create( backupFileName ) ) {
string fileComment = String.Format( "Backup of fCraft data for server \"{0}\", saved on {1}",
string fileComment = String.Format( "Backup of ProCraft data for server \"{0}\", saved on {1}",
ConfigKey.ServerName.GetString(),
DateTime.Now );
using( ZipStorer backupZip = ZipStorer.Create( fs, fileComment ) ) {
Expand Down

0 comments on commit b1e1808

Please sign in to comment.