Fix clearMacros method on MacrosPreferencePage so that it doesn't delete SystemMacoros. Consequently this fixes issues with Default Macros button removing SystemMacros.

Merge branch 'master' into build

Revert "Handle NPE when loading Server Settings."
This reverts commit 91147e009663ff7c50739e690080455c5b2860e7.

Fix monstercount in scripts.

Some minor whitespace cleanups and minor fixes to tag lookups.

This is kind of a brittle update. Simu has put us in a tough spot. They made changes to the server settings for SF 1.0.1.26. This change checks the client string sent with settings and ignores the settings if it's not "1.0.1.25". This fixes things for now, but I expect things will break again when Simu moves everyone to SF 1.0.1.26 or later.

Handle NPE when loading Server Settings.

Catch nulls from serverSettings, take a closer look when character manager feature gets to prime

Merge branch 'build'

removed deprecated IServerScriptProvider

Changed scripts to associate with WarlockClientViewer instead of WarlockClient.

fix yelling to go to the conversation window when the yeller is in the same room.

Remove the @Override where it isn't actually overriding.

Minor cleanup. Back to the conflict that started all of my pain.

add some more unsupported tags from GS4 to the list of stubs.

Add cli to stub tags.

remove gView variable and access the same information a different way.

remove gView variable and access the same information a different way.

Make ProfileConnectAction slightly smarter about which gameView it uses to connect with.

Fix reconnect dialog to pass it's gameView to the ProfileConnect code when it's activated, so that it doesn't use a different gameView.

Make settings unload when their gameview is used for something else, so they can be loaded again for a new client if needed.

Removed Excess unused argument from ClientSettings constructors.

Remove streamListener from the old client when we change clients.

Removed assert that was preventing StreamText from having setClient called successfully on it.

Merge branch 'build'

Fix the StormFrontDocument to handle tailing line ending in settings document.

Added Server Settings Import to SF Settings Import Wizard

Don't allow streams or component updates to be nested with themselves or each other. Make component updates another destination for text like streams. Simplified component tag handler to use a similar code path as the stream tag handlers, and so removed StyledSubTagHandler.

Merge branch 'master' of github.com:kassah/warlock2

Don't remove newlines from empty lines with styles.