Localisation updates from https://translatewiki.net.

* Store panel positions and sizes (if enabled) in more cases (for example, before closing all panels when starting a new game or creating a new map).
* Don't store sizes and positions for fullscreen panels.
* Adds title to map editor frames.
* Plays the default music playlist in the editor.
* Add an action/menu item for disabling/enabling the tile transform panel in the meap editor.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,11 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+** Please report bugs to SourceForge **
+https://sourceforge.net/p/freecol/bugs/

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/build-manual.yml

@@ -0,0 +1,102 @@
+
+name: Create Release Packages
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: 'Release tag (tag/sha/branch)'
+        required: true
+        type: string
+      release_version:
+        description: 'Release version (x.y.z)'
+        required: true
+        type: string
+        
+jobs:
+  build_linux:
+    name: Linux Build
+    runs-on: ubuntu-latest
+    
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.release_tag }}
+        
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      
+      - name: Run tests
+        shell: bash
+        run: |
+          ant -noinput -buildfile build.xml testall
+      
+      - name: Install pdflatex
+        shell: bash
+        run: |
+          sudo apt-get install -y texlive-latex-base texlive-latex-recommended texlive-latex-extra
+          
+      - name: Build artifacts
+        shell: bash
+        run: |
+          ant -noinput -buildfile build.xml -Dfreecol.version=$FREECOL_VERSION dist
+        env:
+          FREECOL_VERSION: ${{ github.event.inputs.release_version }}
+      
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Linux-packages
+          path: dist/
+
+  build_windows:
+    name: Windows Build
+    runs-on: windows-latest
+    
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.release_tag }}
+        
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '19'
+
+      - name: Build artifacts
+        shell: cmd
+        run: |
+          ant -noinput -buildfile build.xml -Dfreecol.version=%FREECOL_VERSION% -Dprint.manual.is.up.to.date=true -Dprint.devmanual.is.up.to.date=true win-complete-installer
+        env:
+          FREECOL_VERSION: ${{ github.event.inputs.release_version }}
+          
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Windows-packages
+          path: dist/releases/
+
+  build_mac:
+    name: Mac Build
+    runs-on: macos-latest
+    
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.release_tag }}
+        
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '19'
+
+      - name: Build artifacts
+        shell: bash
+        run: |
+          ant -noinput -buildfile build.xml -Dfreecol.version=$FREECOL_VERSION -Dprint.manual.is.up.to.date=true -Dprint.devmanual.is.up.to.date=true mac-complete-installer
+        env:
+          FREECOL_VERSION: ${{ github.event.inputs.release_version }}
+      
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Mac-packages
+          path: dist/releases/

.github/workflows/build.yml

@@ -0,0 +1,37 @@
+
+name: Build
+on:
+  push:
+    branches:
+      - master
+    
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+      
+      - name: Run tests
+        shell: bash
+        run: |
+          ant -noinput -buildfile build.xml testall
+          
+      - name: Build artifacts
+        shell: bash
+        run: |
+          ant -noinput -buildfile build.xml nightly-release
+
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: true
+          title: "Development Build"
+          files: |
+            dist/releases/*

.gitignore

@@ -16,8 +16,15 @@ nbproject
 FreeCol.log
 FreeCol*.jar
 src/*.MF
-build/
+build/installer/
+build/net/
 doc/specification_*.html
+doc/*.aux
+doc/*.idx
+doc/*.log
+doc/*.out
+doc/*.pdf
+doc/*.toc
 dist/
 a/
 b/

CHANGELOG.md

@@ -1,66 +1,292 @@
-## FreeCol 0.12.0 (Unreleased) ##
+## FreeCol 1.2.0 (In development) ##
 
-### Developer issues ###
+All savegames from 0.12.0 and up should continue working with 1.2.0.
 
-* **Java 8 is required to build FreeCol.**
-* Resource keys for same images in different resolution can now be added to support higher resolution images when zooming or using --gui-scale option.
-* All client-server interaction now *must* be asynchronous, as askExpecting() has been removed.
-* DOM is gone, and there was much rejoicing.
+### Graphics ###
+* Massive redesign of the colony panel with background images and other styling
+* A new styling for the top menu bar with better contrast. This includes changes like showing the top level menus in a button like style.
+* New styling for radio and checkbox buttons.
+* The face of Peter Minuit now has more realistic coloring. 
 
-### Common problems ###
+### Performance ###
+* Improved rendering performance, and especially when scrolling or moving units.
+* Allow to run FreeCol with only 512MB memory. Please keep in mind that 2GB is still needed for higher resolution, smoother scroll and high rendering quality.
+* Better handling of memory -- for example prioritized automatic clearing of caches when running low on memory.
 
-* Java 7 is no longer receiving active support, therefore the previous version of FreeCol switched to using Java 8 which is the currently supported release.  This hopefully fixed the problems that many Mac users have been experiencing.  If FreeCol 0.12.0 fails to run, check first if your installed Java libraries are up to date.
+### Rule Changes ###
+* Adding the four extra nations to the classic ruleset. These nations are deactivated by default. Having them as a part of the classic ruleset make it easier to play a game with the classic rules, while still having additional players.
+* Bugfix: Fixed a bug that made native settlements be scattered all over the map instead of being grouped by nation (this happened mostly on small maps).
+* Bugfix for "Shippable wagons mod": Wagon trains can now be built when the shippable wagons mod has been enabled.
+
+### User Interface ###
+* The mapboard scrolling is now much smoother and supports pixel-by-pixel scrolling.
+* Allowing scrolling past the borders of a map so that edge tiles can also be placed in focus.
+* It's now possible to use 75% display scaling. This can be used when playing on very small screens where fixed size dialogs would otherwise be larger than the screen.
+* The warehouse dialog can now be resized.
+* Focus is now changed on the mapboard with a single mouse click.
+* Unit dragging can now only be started by clicking on the unit (in order to reduce the likelyhood of accidental goto-orders). In addition, the drag can now be started for units that are currently not the active unit.
+* The active unit is kept when opening a colony panel.
+* The colony panel now works better on small screens.
+* The build queue is no longer displayed when clicking on other buildings than the carpenter type of buildings. 
+* The colony panel can now be more easily dragged by clicking-and-dragging almost anywhere on the colony panel's open spaces.
+* Various fixes and a new visualization of goto-paths.
+* Buildings are now randomly distributed in the colony based on the available space, and can be of different sizes.
+* The panel showing the signing of the Declaration of Independence is now made larger on bigger screens.
+* Panels can now cover the entire mapboard area (this is needed for very small screens in order to show all content).
+* The confirm declaration dialog now fits on small screen.
+* Bugfix: Fixes hidden OK-button in the Colopedia on small screens. 
+* Bugfix: The height of a colony building no longer changes when a worker is added.
+* Bugfix: Lots of small rendering differences between different systems (DPI and OS) have been fixed.
+* Bugfix: Caps the automatic font size at no more than 25% larger than the current scaleFactor.
+* Bugfix: Hides the display of the "option only"-nation type from the start game panel
+* Bugfix: Fixes the tab order on the new game panel.
+
+### Map Editor ###
+* Allow the minimap and other map controls to be resized in the map editor.
+* The areas for native nations can now be defined in the map editor. These areas mark the allowed locations for native settlements for each nations. Overlapping areas are allowed, since proper distance between native settlements are still checked, and can be used for having a random element to the overlap/size of each nation. In addition, it's still possible to define specific settlements that will be used if "Import settlements" is checked when starting a new game.
+* The starting areas for European nations can now be defined in the map editor. A random tile in each nation's starting area is used when starting a new game. The areas may overlap.
+* Unit order buttons are now hidden when in the map editor.
+* Bugfix: Fixes a bug where map width was used for height, and the other way around, when scaling a map in the map editor.
+* Bugfix: A new game is now always loaded before importing or generating a new map. This fixes lots of issues caused by stuff from the old map leaking into the new one.
+
+### AI/computer players ###
+* Bugfix: Fixed a bug that prevented the REF computer player (AI) from completing its turn.
+* Bugfix: Fixed a bug preventing the REF from surrendering.
+* Bugfix: Fixed a bug where the AI sometimes sent ships back and forth to Europe without doing anything.
+
+### Mod development ###
+* Adding an empty image resource file (resource:image.empty) to be used for replacing images with empty space.
+* Mods can now reference abstract types from the base rule without extending a specific base rule.
+* Added "preserve-attributes" that, if true, preserves the attributes of a specification element. This simplifies changing only the subelements. Please note that any "extends" attribute still needs to be repeated since this attributes changes the subelements.
+* The game now displays mod initialization errors to the user in the new game and start game dialogs.
+* An exception is now thrown if a referenced type is used before it's defined.
+
+
+## FreeCol 1.1.0 (May 7, 2023) ##
+
+All savegames from 0.12.0 and up should continue working with 1.1.0.
+
+### Music ###
+* New track: El Dorado
+* New track: Free Colonist
+* New track: Lost City
+* New track: Rainy Day
+* New track: Royal Troops
+* New track: Wagon Wheels
+* Updated the old tracks with new updated versions.
+
+### Graphics ###
+* New graphics for hills and mountains.
+* The standard panel background image is now both brighter and without obvious tiling artifacts on larger screens.
+
+### Rule changes ###
+* Jesuit Missionary can now recommision itself in colonies without a church.
+* Added the mod "Hitpoints and Combat" that adds hitpoints and ranged combat to the game.
+
+### Map Generator ###
+* Great rivers (ocean like, navigable by ships only) are no longer generated by default, but can still be generated if enabled using the Map Generator Options.
+* The number of rivers generated can now be properly controlled using the "Number of rivers" map generator option even when changing map sizes and/or amount of mountains.
+* Enabled generation of rivers that are only two tiles long (the previous limit was three).
+
+### User Interface ###
+* Units in Europe are no longer included in the list of possible active units.
+* Game options and Map generator options are no longer automatically saved and loaded. The default values are initially displayed for all new games.
+* Panels/dialogs are now automatically resized and relocated when changing the size of the application window (including when switching between full screen and windowed mode).
+* Allows the player to easily view all files while loading savegames/maps. 
+* The start game panel can now be resized to smaller than the initial size.
+* The chat panel (start game panel in multiplayer) is now placed directly below the list of players making the dialog work better on small screens.
+* The displayed occupation string on a pioneer now shows "C" for clear forest instead of "P".
+
+### AI/computer players ###
+* Greatly reduces the time needed by the AI (the wait time after ending the turn).
+* The AI now gets less benefits on lower difficulty levels to make everything easier.
+* Escort unit missions are now immediately aborted if the protected unit gets destroyed.
+* More efficient transportation of goods and units (better utilization of the capacity of ships and wagon trains).
+* The AI now produces fewer and better colonies.
+
+### Mod development ###
+* Allow mods to be loaded when making maps in the map editor. This allows maps to be made with new terrain types, and other resources, added by mods.
+* New types of mountains and hills defined by mods are now used when generating maps. The specific type of hill/mountain is determined by the latitude.
+* Partial modifications to the specification is now possible again. This fixes a regression introduced in 0.11.x that prevented the "partial" flag from working.
+* Mods can now define new order buttons (and have them applied without having to restart the game).
+* Bugfix: Mods are no longer loaded twice (thereby causing varius problems in the colony panel and other places when modifications were made).
+* Bugfix: Units that are not available to a player can now be captured if a valid "unit-change" exist.
+
+### Bug fixes ###
+* Fixed a bug that caused the same maps always being generated when starting a new game.
+* Fixes game hangs on end turn in some specific cases.
+* Fixed scaling and placement of goods production icons on colony tiles. 
+* A unit in a building is no longer drawn at the top of the building (that is, the area for showing goods production) if the production is zero.
+* Sound effects are now properly played when attacking.
+* Fixed a bug that prevented the map shortcut buttons on the Map Generator dialog from working properly. The bug caused the button to have no effect the first time it was clicked after restarting the application.
+* Fixed an issue that sometimes prevented mods from being deactivated in the Preferences.
+* The game now fails gracefully if the server cannot be started. This prevents an application freeze when failing to start a new game or failing to load a savegame.
+* Revenge mode is now working again.
+* Fixes an issue that allowed a malicious client (in a multiplayer game) to attack with a unit that had no moves left.
+* The "Train" panel in Europe now has five columns of unit buttons instead of just three.
+* Fixes a bug that sometimes stopped trade routes / goto orders from working. For example, this happened if there was a lost city rumor in the search area of a wagon train on a trade route.
+* Fixes activation of tile improvement actions (like "Plow") after reconnecting.
+* Allows the founding father selection to be postponed without an error message.
+* Fixed a bug that sometimes prevented the map from being redrawn properly after a unit move/attack animation.
+* Highscores can now be stored and displayed again.
+
+
+## FreeCol 1.0.0 (January 2, 2023) ##
+
+On this very day, 20 years ago, we made the first public release of FreeCol. Our releases have until now been marked as alpha/beta even though the number of downloads for our game has long been counted in the millions.
+
+We are extremely proud to finally announce FreeCol 1.0.0!
+
+All 0.12.0 and 0.13.0 games should continue to work with 1.0.0.
+
+
+### User-visible changes since 0.13.0-release ###
+
+#### Graphics ####
+
+* New nation specific colony graphics.
+* New forest graphics
+* New graphics for deserts.
+* New transitions between the base tiles.
+* Minor changes to other graphics.
+
+
+#### Rule changes ####
+
+* Major changes to the tile goods production so that the actual values matches the original game.
+
+
+#### Mod development ####
+
+* It's now possible to define nation specific unit types that can be recruited and purchased in Europe.
+* Added tools for easily making new base tiles from a single tiling texture.
+* A bug that prevented certain images from being overridden by mods has been fixed.
+
+
+#### AI/computer players ####
+
+* The AI now chooses better locations when constructing colonies, and also avoid placing the colonies too close to one another.
+* The AI colony development and expansion have been improved.
+* The AI can now construct docks.
+* More efficient transportation of goods.
+* The AI can now buy units from Europe without cheating.
+* The computer players will now use more advanced tactics when defending and attacking.
+* The AI no longer defends its colonies with scouts.
+* Adding a new escort mission for protecting units. This mission is used for dragoons that are escorting artillery when attacking.
+* National advantages will now change how the AI utilizes its military units. For example, the conquest advantage (spanish) will make the player focus on destroying the natives.
+* The AI will no longer equip specialists (like Elder Statemen) with muskets.
+* AI ships should no longer get stuck outside native settlements.
+
+
+#### Bugfixes ####
+
+* Several bugs that might cause the game to crash have been fixed (for example when all settlements of a native player was destroyed).
+* Fixed several issues with goto-orders that made the game hang after end of turn.
+* Fixed several issues that forced a server reconnect.
+* Fixed leaking file descriptors that crashed the game on Windows.
+* Reduces the amount of jumping around on the map while animating the moves of enemy units.
+* Accelerator keys can now be changed, saved and loaded in the preferences.
+* It's now possible to add the same goods multiple times to the same stop in the trade route panel.
+* Fixes the scaling of several different panels (preferences).
+* Scrolling on the map should now be smoother.
+* Units should no longer have their graphics clipped on the map.
+* Smoother playback of audio.
+* The colony panel is now properly updated when clearing the speciality of a worker.
+* Recursive autosave directories should no longer be created.
+* Several text template fixes.
+* Lots of other minor bugfixes.
+
+
+#### Other changes ####
+* The escape key can now be used to close most panels.
+* There are now separate volume sliders for music and sound effects.
+* Added a mod where basic buildings (level 1) needs to be constructed (except Town Hall and Carpenter's house).
+* Added a mod for having 19th century nations.
+* Treasure trains are now displayed in the cargo report panel.
+* A malfunctional AI should no longer stop the game.
+* Better handling of severe errors like out-of-memory and stack-overflow.
+* Translation updates (a total of 5191 translation strings updated in 53 different languages).
+
+
+
+## FreeCol 0.13.0 (July 9, 2022) ##
+
+The FreeCol team are pleased to announce the release of FreeCol 0.13.0. All 0.11.x (x != 4) and 0.12.0 games should continue to work with 0.13.0, but not vice versa.
+
+We hope you enjoy FreeCol 0.13.0. Onward to 1.0.
+
+The FreeCol Team
+
+
+### User-visible changes since 0.12.0-release ###
+
+* In-game music by Alexander Zhelanov.
+* New skins for the minimap and the unit info panel.
+* New animated rivers.
+* Major river tiles now gets the minor river production bonus twice.
+* The rendering performance has been improved.
+* Rendering quality can now be modified using a new option in the Preferences.
+* More high resolution versions of existing images have been added.
+* Better support for screens with low resolution.
+* Adding two new mods for changing the skins for the minimap and the unit info panel.
+* Multiplayer savegame loading has been fixed.
+* Over 30 bugs fixed.
+
+
+## FreeCol 0.12.0 (May 1, 2022) ##
+
+The FreeCol team are pleased to announce the release of FreeCol 0.12.0.  Its been a while.  All 0.11.x (x != 4) games should continue to work with 0.12.0, but not vice versa.
+
+We hope you enjoy FreeCol 0.12.0. Onward to 1.0.
+
+The FreeCol Team
+
+
+### Java Platform ###
+
+FreeCol requires Java 11 at minimum.  Java 11 is a "Long Term Support" release, but later releases are also known to work.
 
 #### Mac OS ####
-Running FreeCol in Full-screen mode on OSX is known to be problematic and may not work.
+
+Running FreeCol in Full-screen mode on OSX is known to be problematic and may not work well.  As far we can tell this is due to a problem with the Java there, which we are unable to fix.
+
+#### Older Mods ####
+
+Old saved games that use old versions of the mods may lose functionality with the new release.  Most of the packaged mods should continue to work (there are known problems with "convertUpgrade").  New games using the updated mods will work.
+
+
 
 ### User-visible changes since 0.11.6-release ###
 
-#### New Features ####
+#### New features ####
 
-* A number of higher resolution images for units, goods and more have been added to the game.
-* A unit may now be ordered to go to an unexplored tile, as long as there is an adjacent explored tile that the unit can reach (without requring transport).
-* Display of European prices in several dialogs [IR#43](https://sourceforge.net/p/freecol/improvement-requests/43), from Brian Kim, Louise Zhang, Seongmin Park and Michael Jeffers,
-* Move all goods with a hot key [IR#199](https://sourceforge.net/p/freecol/improvement-requests/199/) from Brian Kim, Louise Zhang, Seongmin Park and Michael Jeffers.
-* Easier river editing in map editor through separate options for adding/removing and changing the river style.
+* Major graphics rework
+    * New tile and building images from Misiulo
+    * Support for high-DPI screens, customizable font size and high resolution versions of existing graphics
+    * Support for animations, smooth map scrolling and other improvements to the graphics engine
+* Many new maps, from Euzimar, piotrus, Mazim, organized by Blake
+* A huge expansion of the name lists (regions, ships, colonies) from Marcin
+* A unit may now be ordered to go to an unexplored tile, as long as there is an adjacent explored tile that the unit can reach (without requring transport)
+* Display of European prices in several dialogs [IR#43](https://sourceforge.net/p/freecol/improvement-requests/43), from Brian Kim, Louise Zhang, Seongmin Park and Michael Jeffers
+* Move all goods with a hot key [IR#199](https://sourceforge.net/p/freecol/improvement-requests/199/) from Brian Kim, Louise Zhang, Seongmin Park and Michael Jeffers
+* Easier river editing in map editor through separate options for adding/removing and changing the river style
+* There are now separate options controlling movement speed of your units, other friendly nation units, and other hostile nation units (formerly just your units and other nation units)
+* Over 150 bugs fixed
 
-#### Improvements ####
+
+#### Other improvements ####
 
 * Added tool tip to explain the last sale price annotation on the native settlement panel
 * Added "About FreeCol" button to the opening menu screen [IR#15](https://sourceforge.net/p/freecol/improvement-requests/15/)
 * Added option to disable / enable region naming dialog. [IR#222](https://sourceforge.net/p/freecol/improvement-requests/222)
-* Images of native converts who become dragoons or scouts retain ethnicity, [BR#3086](https://sourceforge.net/p/freecol/bugs/3086).
 * Game options added to adjust trade bonus for native alarm. [BR#3092](https://sourceforge.net/p/freecol/bugs/3092/)
 
-#### Bug Fixes ####
 
-* Fixed scout with goto-orders looping at lost city rumours, and broken messages following exploration of "strange mounds", [BR#2932](https://sourceforge.net/p/freecol/bugs/2932)
-* "slowed by" message no longer reveals enemy privateer nation, [BR#2933](https://sourceforge.net/p/freecol/bugs/2933)
-* The most recently arrived carrier is selected by default when the Europe panel is displayed, [BR#2941](https://sourceforge.net/p/freecol/bugs/2941)
-* Various path finding fixes with middle-click gotos, [BR#2943](https://sourceforge.net/p/freecol/bugs/2943), [BR#2944](https://sourceforge.net/p/freecol/bugs/2944), [BR#2980](https://sourceforge.net/p/freecol/bugs/2980).
-* Abandoning an improvement no longer corrupts the work of other pioneers also working on the same improvement, [BR#2946](https://sourceforge.net/p/freecol/bugs/2946).
-* Trying to overfill a unit with goods in Europe now just does nothing (like other such cases) and does not provoke the "server can not do that" message [IR#214 but really a bug](https://sourceforge.net/p/freecol/improvement-requests/214/)
-* Custom options were broken, again, [BR#2948](https://sourceforge.net/p/freecol/bugs/2948).
-* Fixed bad "trade refused" message, [BR#2950](https://sourceforge.net/p/freecol/bugs/2950).
-* deSoto and scouts could desynchronize the map, [BR#2953](https://sourceforge.net/p/freecol/bugs/2953).
-* Bad turn number when sailing from Europe, [BR#2955](https://sourceforge.net/p/freecol/bugs/2955).
-* Suppress bogus payment listing when dumping in Europe, [BR#2956](https://sourceforge.net/p/freecol/bugs/2956).
-* Suppress bogus colony abandonment warning when spying, [BR#2957](https://sourceforge.net/p/freecol/bugs/2957).
-* Drop carried goods when a brave is captured, [BR#2958](https://sourceforge.net/p/freecol/bugs/2958).
-* Fix colony tile ownership inconsistency,  [BR#2963](https://sourceforge.net/p/freecol/bugs/2963).
-* Clickable link problems, [BR#2965](https://sourceforge.net/p/freecol/bugs/2965).
-* Correctly update after feature change (such as goods party), [BR#2966](https://sourceforge.net/p/freecol/bugs/2966).
-* Problems using units that have exhausted their moves, [BR#2968](https://sourceforge.net/p/freecol/bugs/2968).
-* Slight clarification of unattended production modifiers, [BR#2973](https://sourceforge.net/p/freecol/bugs/2973).
-* Stop accumulating colonies in classic colony report, [BR#2974](https://sourceforge.net/p/freecol/bugs/2974).
-* Many Col1-compatibility checks and bugfixes with tile and building production with help from Lone_Wolf, [BR#2978](https://sourceforge.net/p/freecol/bugs/2978), [BR#2979](https://sourceforge.net/p/freecol/bugs/2979), [BR#2981](https://sourceforge.net/p/freecol/bugs/2981).
-* New versions of the national anthems and addition of the missing ones, from CalebRW.
-* Problems with selecting from multiple wagons in the build queue [BR#2014](https://sourceforge.net/p/freecol/bugs/2014), fixed by Lars Willemsens.
-* Problems with auto-save cleanup [BR#1307](https://sourceforge.net/p/freecol/bugs/1307), fixed by Lars Willemsens.
-* Various fixes to the map editor including smaller dialog for changing river styles [BR#2926](https://sourceforge.net/p/freecol/bugs/2926).
-* Layout of Warehouse Panel got improved to better fit inside the minimum supported resolution [BR#3033](https://sourceforge.net/p/freecol/bugs/3033), contributed by Jonas Stevnsvig.
-* Seasoned Scouts no longer disappear at LSR's according to Col1 and no longer increase negative results. [BR#3093](https://sourceforge.net/p/freecol/bugs/3093/)
-* Delivering gifts to Natives has a stronger effect on reducing native alarm. [BR#3092](https://sourceforge.net/p/freecol/bugs/3092/)
+### Developer issues ###
+
+* **Java 11 is required to build FreeCol.**
+* Resource keys for same images in different resolution can now be added to support higher resolution images when zooming or using --gui-scale option.
+* DOM is gone, and there was much rejoicing.
 
 
 ## FreeCol 0.11.6 (October 16, 2015) ##
@@ -216,4 +442,4 @@ but rejected suggested colony names are now recycled.
 - Large message renaming for consistency and ease of checking.
 - Nation options now have a distinct tag that does not rely on capitalization.
 - Other serialization naming consistency fixes.
-- Added --headless command line option.
+- Added --headless command line option.

README.md

@@ -42,8 +42,6 @@ image of what Colonization 2 would have been.
 
 #### Supports Mac OS X, Windows, and Linux
 
-Current stable release is _0.11.6_, since this release, there has been a complete code overhaul over the last 2 years, and we are nearing a stable release (0.12.0)
-
 The latest binary releases are created weekly and contain Mac OS X, Windows, and Linux installers.
 
 * See: [Weekly Releases](https://github.com/FreeCol/freecol/releases)
@@ -69,5 +67,10 @@ Build the latest version of the code by running:
 ant
 ```
 
-Requires Java 9, Ant, and Java SDK to build.
+Requires Java 11, Ant, and Java SDK to build.
+
+
+## License
+
+The source code is licensed under the GPL v2. Most of the content, like artwork, music and sound effects, are also licensed under GPL v2. Some of the content is licensed using CC BY 4.0. Please refer to the README file in the same directory as the included content for more details.
 

SECURITY.md

@@ -2,12 +2,16 @@
 
 ## Supported Versions
 
-| Version | Supported          |
-| ------- | ------------------ |
+| Version    | Supported          |
+| ---------- | ------------------ |
+| 1.1.0      | :white_check_mark: |
+| 1.0.0      | :white_check_mark: |
+| 0.13.0     | :white_check_mark: |
+| 0.12.0     | :white_check_mark: |
 | 0.11.7-dev | :white_check_mark: |
-| 0.11.6   | :white_check_mark: |
-| < 0.11.6 | :x:                |
+| 0.11.6     | :white_check_mark: |
+| < 0.11.6   | :x:                |
 
 ## Reporting a Vulnerability
 
-Email freecol-developers@lists.sourceforge.net for any major security vulnerabilities.
+Email abuse@freecol.org for any major security vulnerabilities.

bin/website.sh

@@ -1,11 +1,13 @@
 #! /bin/sh
 # Upload the website
 #
-# Default is to upload what changed recently, with -g from a specific commit.
-# -a just uploads all of it.
+# Former default is to upload what changed recently, with -g from a
+# specific commit.  -a just uploads all of it.  But with the jekyll
+# stage, we can not reliably tell what has changed, so now defaulting to
+# full upload.
 #
-set -xv
-MODE=prev
+#set -xv
+MODE=all
 while test "x$1" != "x" ; do
     case "x$1" in
     "x-a")
@@ -26,14 +28,24 @@ if test "x$USERNAME" = "x" ; then
     exit 1
 fi
 WEBDIR=www.freecol.org
+if test ! -d "$WEBDIR" ; then
+   echo "run from the top of the source tree, $WEBDIR should be a subdirectory" >&2
+   exit 1
+fi
+
+# Build the website
+(cd "$WEBDIR" ; jekyll build) || exit $?
 
 if test "x$MODE" = "xall" ; then
     {
         echo "cd /home/project-web/freecol/htdocs"
-        find www.freecol.org -type f -print \
-            | sed -e 's|^www.freecol.org/\(.*\)$|put \1 \1|'
-    } | (cd "$WEBDIR" ; sftp $USERNAME,freecol@web.sf.net)
+        find "$WEBDIR/_site" -type f -print \
+            | sed -n -e "s|^$WEBDIR/_site/"'\(.*\)$|put \1 \1|p'
+    } | (cd "$WEBDIR/_site" ; sftp $USERNAME,freecol@web.sf.net)
 else
+    echo "incremental mode disabled" >&2
+    exit 1
+    
     if test "x$MODE" = "xprev" ; then
         PREV=`git log --pretty=oneline "$WEBDIR" | sed -n -e '2s/^\([^ ]*\).*$/\1/p'`
     else
@@ -41,6 +53,6 @@ else
     fi
     {
         echo "cd /home/project-web/freecol/htdocs"
-        git diff --name-only "$PREV" HEAD -- "$WEBDIR" | sed -e 's|^[^/]*/\(.*\)$|put \1 \1|p'
-    } | (cd "$WEBDIR" ; sftp $USERNAME,freecol@web.sf.net)
+        git diff --name-only "$PREV" HEAD -- "$WEBDIR" | sed -n -e 's|^[^/]*/\(.*\)$|put \1 \1|p'
+    } | cat #(cd "$WEBDIR" ; sftp $USERNAME,freecol@web.sf.net)
 fi

build.xml

@@ -9,7 +9,7 @@
         the metaserver, distribution packages, running tests
         and creating documentation.
     </description>
-    <property name="java.target.version" value="1.9"/>
+    <property name="java.target.version" value="11"/>
     <property name="freecol.name" value="freecol"/>
     <property environment="env"/>
     <property name="freecol.data.dir" value="${basedir}/data"/>
@@ -28,9 +28,9 @@
               value="${freecol.src.dir}/overview.html"/>
     <property name="test" value="AllTests"/>
     <property name="miglayout-swing.jar"
-              value="jars/miglayout-swing-5.0.jar"/>
+              value="jars/miglayout-swing-5.3.jar"/>
     <property name="miglayout-core.jar"
-              value="jars/miglayout-core-5.0.jar"/>
+              value="jars/miglayout-core-5.3.jar"/>
     <property name="cli.jar" value="jars/commons-cli-1.4.jar"/>
     <property name="cortado.jar" value="jars/cortado-0.6.0.jar"/>
 
@@ -387,7 +387,7 @@
                         <authors>
                             <author name="The FreeCol Team" email="developers@freecol.org" />
                         </authors>
-                        <javaversion>1.9</javaversion>
+                        <javaversion>11</javaversion>
                     </info>
                     <guiprefs width="640" height="480" resizable="no">
                         <laf name="looks">
@@ -510,6 +510,70 @@
         <jsmoothgen project="${freecol.release.dir}/installer.jsmooth"
                     skeletonroot="${freecol.build.dir}/skeletons"/>
     </target>
+    
+    <target name="win-complete-installer"
+            description="Builds an installer for Windows with an included JVM."
+            depends="initDist,prepareManual,prepareBaseFiles">
+        
+        <exec executable="jpackage" dir="." >
+            <arg value="--input"/>
+            <arg file="${freecol.release.dir}/base/freecol/"/>
+            <arg value="--type"/>
+            <arg value="exe"/>
+            <arg value="--name"/>
+            <arg value="FreeCol"/>
+            <arg value="--dest"/>
+            <arg file="${freecol.release.dir}"/>
+            <arg value="--add-modules"/>
+            <arg value="java.base,java.datatransfer,java.desktop,java.logging,java.xml"/>
+            <arg value="--main-jar"/>
+            <arg value="FreeCol.jar"/>
+            <arg value="--win-dir-chooser"/>
+            <arg value="--win-menu"/>
+            <arg value="--win-shortcut"/>
+            <arg value="--arguments"/>
+            <arg value="--freecol-data app/data"/>
+            <arg value="--app-version"/>
+            <arg value="${freecol.version}"/>
+            <arg value="--icon"/>
+            <arg file="packaging/icons/freecol.ico"/>
+        </exec>
+    	
+        <mkdir dir="${freecol.release.dir}/releases"/>
+        <copy todir="${freecol.release.dir}/releases">
+            <fileset dir="${freecol.release.dir}" includes="FreeCol-*"/>
+        </copy>
+    </target>
+	
+    <target name="mac-complete-installer"
+            description="Builds an installer for macOs with an included JVM."
+            depends="initDist,prepareManual,prepareBaseFiles">
+        
+        <exec executable="jpackage" dir="." >
+            <arg value="--input"/>
+            <arg file="${freecol.release.dir}/base/freecol/"/>
+            <arg value="--name"/>
+            <arg value="FreeCol"/>
+            <arg value="--dest"/>
+            <arg file="${freecol.release.dir}"/>
+            <arg value="--add-modules"/>
+            <arg value="java.base,java.datatransfer,java.desktop,java.logging,java.xml"/>
+            <arg value="--main-jar"/>
+            <arg value="FreeCol.jar"/>
+            <arg value="--arguments"/>
+            <arg value="--freecol-data $$APPDIR/data"/>
+            <arg value="--app-version"/>
+            <arg value="${freecol.version}"/>
+            <arg value="--mac-package-identifier"/>
+            <arg value="org.freecol.FreeCol"/>
+            <arg value="--icon"/>
+            <arg file="packaging/icons/FreeCol.icns"/>
+        </exec>
+        <mkdir dir="${freecol.release.dir}/releases"/>
+        <copy todir="${freecol.release.dir}/releases">
+            <fileset dir="${freecol.release.dir}" includes="FreeCol-*"/>
+        </copy>
+    </target>
 
     <!-- Builds a doubleclickable application bundle running on Mac OS X -->
     <target name="macJavaBundle" unless="skip.dist.mac"
@@ -529,8 +593,8 @@
                     name="FreeCol"
                     mainclass="${freecol.main.class}"
                     version="${freecol.version}"
-                    vmoptions="-Xmx1G -Dapple.awt.fakefullscreen=true"
-                    jvmversion="1.9+"
+                    vmoptions="-Xmx2G -Dapple.awt.fakefullscreen=true"
+                    jvmversion="1.11"
                     arguments="--windowed --freecol-data FreeCol.app/Contents/Resources/"
                     stubfile="${freecol.build.dir}/skeletons/universalJavaApplicationStub"
                     useJavaXKey="true"
@@ -962,7 +1026,7 @@
     <!-- This is a shortcut for NetBeans, and possibly other IDEs. -->
     <target name="run" depends="package" description="Runs the game">
         <java jar="FreeCol.jar" fork="true">
-            <jvmarg value="-Xmx1G" />
+            <jvmarg value="-Xmx2G" />
         </java>
     </target>
 

build/startup.jsmooth

@@ -15,13 +15,13 @@
     <embeddedJar>false</embeddedJar>
     <executableName>freecol.exe</executableName>
     <iconLocation>../packaging/icons/freecol.ico</iconLocation>
-    <initialMemoryHeap>134217728</initialMemoryHeap>
+    <initialMemoryHeap>1073741824</initialMemoryHeap>
     <javaProperties>
         <name>sun.java2d.d3d</name>
         <value>false</value>
     </javaProperties>
     <mainClassName>net.sf.freecol.FreeCol</mainClassName>
-    <maximumMemoryHeap>536870912</maximumMemoryHeap>
+    <maximumMemoryHeap>2147483647</maximumMemoryHeap>
     <maximumVersion></maximumVersion>
     <minimumVersion>1.8</minimumVersion>
     <skeletonName>Windowed Wrapper</skeletonName>

build/unixShortcutSpec.xml

@@ -13,7 +13,6 @@
               type="Application"
               commandLine="--windowed"
               workingDirectory="$INSTALL_PATH"
-              categories="Application;Game;StrategyGame"
               description="A turn-based strategy game based on 'Sid Meier's Colonization'."
               iconFile="$INSTALL_PATH/freecol.xpm"
               iconIndex="0"

data/base/client-options.xml

@@ -33,6 +33,7 @@
       <rangeOption id="model.option.displayScaling"
                    defaultValue="0" localizedLabels="true">
         <rangeValue label="model.option.displayScaling.automatic" value="0"/>
+        <rangeValue label="model.option.displayScaling.75" value="75"/>
         <rangeValue label="model.option.displayScaling.100" value="100"/>
         <rangeValue label="model.option.displayScaling.125" value="125"/>
         <rangeValue label="model.option.displayScaling.150" value="150"/>
@@ -53,7 +54,18 @@
       <!-- Use XRender or not? -->
       <booleanOption id="model.option.useXRender"
                      defaultValue="true"/>
-      
+
+      <booleanOption id="model.option.useTerrainAnimations" defaultValue="true"/>
+
+      <rangeOption id="model.option.graphicsQuality"
+                   defaultValue="20" localizedLabels="true">
+        <rangeValue label="clientOptions.gui.graphicsQuality.lowest" value="0"/>
+        <rangeValue label="clientOptions.gui.graphicsQuality.low" value="10"/>
+        <rangeValue label="clientOptions.gui.graphicsQuality.normal" value="20"/>
+        <rangeValue label="clientOptions.gui.graphicsQuality.high" value="30"/>
+        <rangeValue label="clientOptions.gui.graphicsQuality.highest" value="40"/>
+      </rangeOption>      
+
       <!-- Animation speed for our units. -->
       <rangeOption id="model.option.moveAnimationSpeed"
                    defaultValue="3" localizedLabels="true">
@@ -144,14 +156,7 @@
                        defaultValue="false"/>
         <!-- Whether to display the map controls by default or not. -->
         <booleanOption id="model.option.displayMapControls"
-                       defaultValue="true"/>
-        <!-- What type of map controls, corner or classic? -->
-        <stringOption id="model.option.mapControls"
-                      defaultValue="clientOptions.gui.mapControls.CornerMapControls">
-          <choice value="clientOptions.gui.mapControls.CornerMapControls"/>
-          <choice value="clientOptions.gui.mapControls.ClassicMapControls"/>
-        </stringOption>
-                       
+                       defaultValue="true"/>                       
         <!-- Draw the fog of war on the minimap. -->
         <booleanOption id="model.option.miniMapToggleFogOfWar"
                        defaultValue="true"/>
@@ -359,9 +364,15 @@
       <!-- Which mixer to use by default. -->
       <audioMixerOption id="model.option.audioMixer"
                         defaultValue="AUTO" />
-      <!-- The default volume percent. -->
-      <percentageOption id="model.option.audioVolume"
+
+      <!--The music volume -->
+      <percentageOption id="model.option.musicVolume"
                         defaultValue="100" previewEnabled="true"/>
+                        
+      <!--The sound effects volume -->
+      <percentageOption id="model.option.soundEffectsVolume"
+                        defaultValue="100" previewEnabled="true"/>
+                        
       <!-- Play an alert sound on message arrival. -->
       <booleanOption id="model.option.audioAlerts"
                      defaultValue="false"/>

data/base/resources.properties

@@ -1,6 +1,7 @@
 ## Colors
 color.background.MiniMap=urn:color:0x000000
 color.border.MiniMap=urn:color:0xffffff
+color.carrier.selected=urn:color:0x957357
 # used in FreeColLookAndFeel
 color.primary1.LookAndFeel=urn:color:0x7a6d52
 color.backgroundSelect.LookAndFeel=urn:color:0xfff4c3
@@ -27,6 +28,7 @@ animatedfont.signature=resources/fonts/signature.faf
 ## Images
 
 # Backgrounds
+image.empty=resources/images/empty.png
 image.background.Paper=resources/images/ui/bg_paper.png
 image.background.ColorCellRenderer=resource:image.background.Paper
 image.background.FreeColBrightPanel=resources/images/ui/bg_paper_bright.png
@@ -35,9 +37,11 @@ image.background.FreeColButton=resources/images/ui/bg_button.png
 image.background.MainPanel=resources/images/ui/bg_brown.png
 image.background.AboutPanel=resources/images/ui/bg_brown.png
 image.background.ColopediaPanel=resources/images/ui/bg_brown.png
+image.background.ColonyPanel=resources/images/ui/bg_paper_brown.png
 
 image.background.FreeColList=resource:image.background.Paper
-image.background.FreeColMenuBar=resources/images/ui/bg_brown.png
+image.background.FreeColMenuBar=resources/images/ui/bg_menubar.png
+image.background.FreeColMenu=resources/images/ui/bg_paper_brown.png
 image.background.FreeColOptionPane=resource:image.background.Paper
 image.background.FreeColPanel=resource:image.background.Paper
 image.background.FreeColPopupMenu=resource:image.background.Paper
@@ -46,7 +50,15 @@ image.background.FreeColTextArea=resource:image.background.FreeColBrightPanel
 image.background.FreeColTextField=resource:image.background.FreeColBrightPanel
 image.background.FreeColToolTip=resource:image.background.Paper
 
+image.cargohold.available=resources/images/ui/cargohold.png
+image.cargohold.unavailable=resources/images/ui/cargohold-unavailable.png
+image.colony.docks.background=resources/images/ui/colonydocks.png
+image.colony.docks.sky.background=resources/images/ui/colonydocks-sky.png
+image.colony.warehouse.background=resources/images/ui/warehouse-bg.png
+image.colony.upperRight.background=resources/images/ui/colony-upper-right-bg.png
+
 # Borders
+#image.border.menu.s=resource:image.empty
 image.border.menu.s=resources/images/ui/menuborder.png
 
 image.border.panel.noshadow.n=resources/images/ui/panelborder-noshadow-n.png
@@ -85,8 +97,74 @@ image.border.button.simple.ne=resources/images/ui/simplebuttonborder-ne.png
 image.border.button.simple.sw=resources/images/ui/simplebuttonborder-sw.png
 image.border.button.simple.se=resources/images/ui/simplebuttonborder-se.png
 
+image.border.wooden.n=resources/images/ui/border/wooden/woodenborder-n.png
+image.border.wooden.w=resources/images/ui/border/wooden/woodenborder-w.png
+image.border.wooden.e=resources/images/ui/border/wooden/woodenborder-e.png
+image.border.wooden.s=resources/images/ui/border/wooden/woodenborder-s.png
+image.border.wooden.nw=resources/images/ui/border/wooden/woodenborder-nw.png
+image.border.wooden.ne=resources/images/ui/border/wooden/woodenborder-ne.png
+image.border.wooden.sw=resources/images/ui/border/wooden/woodenborder-sw.png
+image.border.wooden.se=resources/images/ui/border/wooden/woodenborder-se.png
+
+image.border.colonyWarehouse.n=resources/images/ui/border/wooden/woodenborder-n.png
+#image.border.colonyWarehouse.w=resources/images/ui/border/wooden/woodenborder-w.png
+image.border.colonyWarehouse.e=resources/images/ui/border/wooden/woodenborder-e.png
+#image.border.colonyWarehouse.s=resources/images/ui/border/wooden/woodenborder-s.png
+image.border.colonyWarehouse.nw=resources/images/ui/border/wooden/woodenborder-nw.png
+image.border.colonyWarehouse.ne=resources/images/ui/border/wooden/woodenborder-ne.png
+#image.border.colonyWarehouse.sw=resources/images/ui/border/wooden/woodenborder-sw.png
+#image.border.colonyWarehouse.se=resources/images/ui/border/wooden/woodenborder-se.png
+
+image.border.colony.panel.n=resources/images/ui/border/carvedwood/carvedwoodenborder-n.png
+image.border.colony.panel.w=resources/images/ui/border/carvedwood/carvedwoodenborder-w.png
+image.border.colony.panel.e=resources/images/ui/border/carvedwood/carvedwoodenborder-e.png
+image.border.colony.panel.s=resources/images/ui/border/carvedwood/carvedwoodenborder-s.png
+image.border.colony.panel.nw=resources/images/ui/border/carvedwood/carvedwoodenborder-nw.png
+image.border.colony.panel.ne=resources/images/ui/border/carvedwood/carvedwoodenborder-ne.png
+image.border.colony.panel.sw=resources/images/ui/border/carvedwood/carvedwoodenborder-sw.png
+image.border.colony.panel.se=resources/images/ui/border/carvedwood/carvedwoodenborder-se.png
+
+image.border.colony.panel.inner.n=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-n.png
+image.border.colony.panel.inner.w=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-w.png
+image.border.colony.panel.inner.e=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-e.png
+image.border.colony.panel.inner.s=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-s.png
+image.border.colony.panel.inner.nw=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-nw.png
+#image.border.colony.panel.inner.ne=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-ne.png
+image.border.colony.panel.inner.sw=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-sw.png
+image.border.colony.panel.inner.se=resources/images/ui/border/carvedwood/carvedwoodenborder-inner-se.png
+
+image.border.colony.panel.inner.ne=resources/images/ui/border/carvedwood/carvedwood-colony-inner-ne.png
+image.border.colony.panel.inner.nne=resources/images/ui/border/carvedwood/carvedwood-colony-inner-nne.png
+image.border.colony.panel.inner.ene=resources/images/ui/border/carvedwood/carvedwood-colony-inner-ene.png
+
+
+image.border.colony.panel.outer.n=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-n.png
+image.border.colony.panel.outer.w=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-w.png
+image.border.colony.panel.outer.e=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-e.png
+image.border.colony.panel.outer.s=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-s.png
+image.border.colony.panel.outer.nw=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-nw.png
+#image.border.colony.panel.outer.ne=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-ne.png
+image.border.colony.panel.outer.sw=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-sw.png
+image.border.colony.panel.outer.se=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-se.png
+image.border.colony.panel.outer.nnw=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-nnw.png
+#image.border.colony.panel.outer.nne=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-nne.png
+#image.border.colony.panel.outer.ene=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-ene.png
+image.border.colony.panel.outer.ese=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-ese.png
+image.border.colony.panel.outer.sse=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-sse.png
+image.border.colony.panel.outer.ssw=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-ssw.png
+image.border.colony.panel.outer.wsw=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-wsw.png
+image.border.colony.panel.outer.wnw=resources/images/ui/border/carvedwood/carvedwoodenborder-outer-wnw.png
+image.border.colony.panel.outer.ne=resources/images/ui/border/carvedwood/carvedwood-colony-outer-ne.png
+image.border.colony.panel.outer.nne=resources/images/ui/border/carvedwood/carvedwood-colony-outer-nne.png
+image.border.colony.panel.outer.ene=resources/images/ui/border/carvedwood/carvedwood-colony-outer-ene.png
+
+
 # Interface
+image.ui.button.radio=resources/images/ui/button-radio.png
+image.ui.button.radio.selected=resources/images/ui/button-radio-selected.png
 image.ui.checkmark=resources/images/ui/checkmark.png
+image.ui.includesSpecification=resources/images/ui/includes-specification.png
+image.ui.noSpecification=resources/images/ui/no-specification.png
 
 # Cursors
 image.icon.cursor.go=resources/images/ui/go.png
@@ -97,13 +175,18 @@ image.mask.sw=resources/images/masks/mask-center-sw.png
 image.mask.ne=resources/images/masks/mask-center-ne.png
 image.mask.nw=resources/images/masks/mask-center-nw.png
 image.mask.se=resources/images/masks/mask-center-se.png
+image.mask.special.beach.ne=resources/images/masks/mask-special-beach_ne.png
+image.mask.special.beach.sw=resources/images/masks/mask-special-beach_sw.png
 
 # Miscellaneous
 image.flavor.Canvas.map=resources/images/ui/map.jpg
 image.flavor.Title=resources/images/ui/freecol2.png
 image.miscicon.delete=resources/images/misc/delete.png
 image.miscicon.FrameIcon=resources/images/ui/frame-icon.png
+image.rangedTarget=resources/images/ui/ranged-target.png
+
 # Order buttons
+image.miscicon.button.normal.ranged=resources/images/ui/order-buttons/normal/ranged.png
 image.miscicon.button.normal.wait=resources/images/ui/order-buttons/normal/wait.png
 image.miscicon.button.normal.done=resources/images/ui/order-buttons/normal/done.png
 image.miscicon.button.normal.fortify=resources/images/ui/order-buttons/normal/fortify.png
@@ -119,6 +202,7 @@ image.miscicon.button.normal.toggle_fog_of_war=resources/images/ui/order-buttons
 image.miscicon.button.normal.toggle_fog_of_war_no=resources/images/ui/order-buttons/normal/toggle_fog_of_war_no.png
 image.miscicon.button.normal.toggle_view_politics=resources/images/ui/order-buttons/normal/toggle_view_politics.png
 image.miscicon.button.normal.toggle_view_economic=resources/images/ui/order-buttons/normal/toggle_view_economic.png
+image.miscicon.button.highlighted.ranged=resources/images/ui/order-buttons/highlighted/ranged.png
 image.miscicon.button.highlighted.wait=resources/images/ui/order-buttons/highlighted/wait.png
 image.miscicon.button.highlighted.done=resources/images/ui/order-buttons/highlighted/done.png
 image.miscicon.button.highlighted.fortify=resources/images/ui/order-buttons/highlighted/fortify.png
@@ -134,6 +218,7 @@ image.miscicon.button.highlighted.toggle_fog_of_war=resources/images/ui/order-bu
 image.miscicon.button.highlighted.toggle_fog_of_war_no=resources/images/ui/order-buttons/highlighted/toggle_fog_of_war_no.png
 image.miscicon.button.highlighted.toggle_view_politics=resources/images/ui/order-buttons/highlighted/toggle_view_politics.png
 image.miscicon.button.highlighted.toggle_view_economic=resources/images/ui/order-buttons/highlighted/toggle_view_economic.png
+image.miscicon.button.pressed.ranged=resources/images/ui/order-buttons/pressed/ranged.png
 image.miscicon.button.pressed.wait=resources/images/ui/order-buttons/pressed/wait.png
 image.miscicon.button.pressed.done=resources/images/ui/order-buttons/pressed/done.png
 image.miscicon.button.pressed.fortify=resources/images/ui/order-buttons/pressed/fortify.png
@@ -149,6 +234,7 @@ image.miscicon.button.pressed.toggle_fog_of_war=resources/images/ui/order-button
 image.miscicon.button.pressed.toggle_fog_of_war_no=resources/images/ui/order-buttons/pressed/toggle_fog_of_war_no.png
 image.miscicon.button.pressed.toggle_view_politics=resources/images/ui/order-buttons/pressed/toggle_view_politics.png
 image.miscicon.button.pressed.toggle_view_economic=resources/images/ui/order-buttons/pressed/toggle_view_economic.png
+image.miscicon.button.disabled.ranged=resources/images/ui/order-buttons/disabled/ranged.png
 image.miscicon.button.disabled.wait=resources/images/ui/order-buttons/disabled/wait.png
 image.miscicon.button.disabled.done=resources/images/ui/order-buttons/disabled/done.png
 image.miscicon.button.disabled.fortify=resources/images/ui/order-buttons/disabled/fortify.png
@@ -167,8 +253,11 @@ image.miscicon.button.disabled.toggle_view_economic=resources/images/ui/order-bu
 
 # Skins
 image.skin.MiniMap=resources/images/ui/minimap-skin.png
-image.skin.InfoPanel=resources/images/ui/infopanel-skin_120.pct.png
+image.skin.MiniMap.properties="minimap.x=41,minimap.y=203,minimap.width=224,minimap.height=160,politicalButton.x=22,politicalButton.y=234,fogOfWarButton.x=22,fogOfWarButton.y=270,zoomInButton.x=22,zoomInButton.y=306,zoomOutButton.x=22,zoomOutButton.y=337"
+image.skin.InfoPanel=resources/images/ui/infopanel-skin.png
+image.skin.InfoPanel.properties="panel.x=52,panel.y=146,panel.width=250,panel.height=138"
 image.skin.compass=resources/images/ui/compass.png
 
 ## Sounds (one is needed for SoundTest)
 sound.intro.general=resources/sound/intro.ogg
+sound.intro.general.type="music"