[freecol] 88/125: Merge tag 'upstream/0.11.6+dfsg'
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 20 19:39:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository freecol.
commit 18bf7834fbabebdfa17ff1105f7743f45314c619
Merge: 5e5b2b5 b956a1d
Author: Markus Koschany <apo at debian.org>
Date: Sat Dec 19 23:13:53 2015 +0100
Merge tag 'upstream/0.11.6+dfsg'
Upstream version 0.11.6+dfsg
# gpg: Signature made Sat 19 Dec 2015 23:13:48 CET using RSA key ID 513B51E4
# gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
# gpg: aka "Markus Koschany <markus at koschany.net>" [ultimate]
# gpg: aka "Markus Koschany <apo at debian.org>" [ultimate]
README | 4 +-
bin/btan.sh | 154 +
bin/copyyear.sh | 15 +
bin/fclogscore.sh | 53 +
bin/fsgpack.sh | 17 +
bin/fsgscore.sh | 48 +
bin/fsgunpack.sh | 21 +
bin/integrity.sh | 39 +
bin/release.sh | 45 +
bin/stats.awk | 22 +
bin/website.sh | 14 +
build.xml | 723 ++-
build/bin/native/izpack/ShellLink.dll | Bin 0 -> 53248 bytes
build/bin/native/izpack/ShellLink_x64.dll | Bin 0 -> 50176 bytes
build/install.png | Bin 0 -> 16698 bytes
build/installer.jsmooth | 40 +
build/installer/iso-639-2.txt | 506 ++
build/installer/lang.xml_cat | 28 +
build/installer/lang.xml_chn | 28 +
build/installer/lang.xml_cze | 28 +
build/installer/lang.xml_dan | 28 +
build/installer/lang.xml_deu | 28 +
build/installer/lang.xml_eng | 28 +
build/installer/lang.xml_eus | 28 +
build/installer/lang.xml_fin | 28 +
build/installer/lang.xml_fra | 28 +
build/installer/lang.xml_glg | 28 +
build/installer/lang.xml_hun | 28 +
build/installer/lang.xml_ita | 28 +
build/installer/lang.xml_jpn | 28 +
build/installer/lang.xml_mys | 28 +
build/installer/lang.xml_ned | 28 +
build/installer/lang.xml_nor | 28 +
build/installer/lang.xml_pol | 28 +
build/installer/lang.xml_por | 28 +
build/installer/lang.xml_prt | 28 +
build/installer/lang.xml_rus | 28 +
build/installer/lang.xml_spa | 28 +
build/installer/lang.xml_swe | 28 +
build/installer/lang.xml_ukr | 28 +
build/skeletons/FreeCol | Bin 0 -> 64532 bytes
build/skeletons/console-wrapper/consolewrapper.exe | Bin 0 -> 392192 bytes
build/skeletons/console-wrapper/description.skel | 40 +
build/skeletons/windowed-wrapper/description.skel | 44 +
build/skeletons/windowed-wrapper/jwrap.exe | Bin 0 -> 401920 bytes
splash.jpg => build/splash.jpg | Bin
build/startup.jsmooth | 44 +
build/uninstaller.jsmooth | 40 +
build/unixShortcutSpec.xml | 78 +
build/winShortcutSpec.xml | 70 +
config/Eclipse/freecol_code_templates.xml | 2 +-
config/nbproject/ide-targets.xml | 25 +
config/nbproject/project.xml | 21 +-
data/base/client-options.xml | 317 +-
data/base/resources.properties | 109 +-
data/base/resources/fonts/Imperator.ttf | Bin 47788 -> 0 bytes
data/base/resources/fonts/LiberationSerif-Bold.ttf | Bin 129416 -> 0 bytes
.../resources/fonts/LiberationSerif-BoldItalic.ttf | Bin 100392 -> 0 bytes
.../resources/fonts/LiberationSerif-Italic.ttf | Bin 100420 -> 0 bytes
.../resources/fonts/LiberationSerif-Regular.ttf | Bin 156076 -> 0 bytes
data/base/resources/images/ui/building_section.png | Bin 1158 -> 0 bytes
data/base/resources_ar.properties | 6 +-
data/base/resources_arz.properties | 6 +-
data/base/resources_be-tarask.properties | 6 +-
data/base/resources_bg.properties | 6 +-
data/base/resources_el.properties | 6 +-
data/base/resources_fa.properties | 6 +-
data/base/resources_grc.properties | 6 +-
data/base/resources_he.properties | 6 +-
data/base/resources_ja.properties | 6 +-
data/base/resources_km.properties | 6 +-
data/base/resources_ko.properties | 3 +
data/base/resources_mk.properties | 6 +-
data/base/resources_ru.properties | 6 +-
data/base/resources_ta.properties | 6 +-
data/base/resources_uk.properties | 6 +-
data/base/resources_zh-hant.properties | 3 +
data/base/resources_zh_CN.properties | 6 +-
data/base/roles-compat.xml | 193 +
data/maps/Africa.fsg | Bin 103463 -> 88498 bytes
data/maps/America_large.fsg | Bin 141913 -> 325753 bytes
data/maps/Australia.fsg | Bin 68345 -> 53294 bytes
data/maps/Caribbean_basin.fsg | Bin 50982 -> 35836 bytes
data/mods/bryce/FreeColMessages.properties | 2 +
data/mods/bryce/mod.xml | 1 +
data/mods/bryce/specification.xml | 283 +
data/mods/classic_ui/resources.properties | 71 +-
.../mods/convertUpgrade/FreeColMessages.properties | 2 +
data/mods/convertUpgrade/mod.xml | 1 +
data/mods/convertUpgrade/specification.xml | 36 +
data/mods/daySeasons/FreeColMessages.properties | 3 +
data/mods/daySeasons/ModMessages.properties | 365 ++
data/mods/daySeasons/mod.xml | 1 +
data/mods/daySeasons/specification.xml | 12 +
data/mods/example/FreeColMessages.properties | 2 +-
data/mods/example/ModMessages.properties | 1 +
data/mods/example/resources.properties | 13 +-
data/mods/example/specification.xml | 8 +-
data/mods/fourSeasons/FreeColMessages.properties | 3 +
data/mods/fourSeasons/ModMessages.properties | 4 +
data/mods/fourSeasons/mod.xml | 1 +
data/mods/fourSeasons/specification.xml | 12 +
data/mods/hutzli/resources.properties | 100 +-
.../images/units/{default => ship}/caravel.png | Bin
.../images/units/{default => ship}/frigate.png | Bin
.../images/units/{default => ship}/galleon.png | Bin
.../images/units/{default => ship}/manOWar.png | Bin
.../images/units/{default => ship}/merchantman.png | Bin
.../images/units/{default => ship}/privateer.png | Bin
data/mods/markovoss/FreeColMessages.properties | 18 -
data/mods/markovoss/ModMessages.properties | 17 +
data/mods/markovoss/resources.properties | 235 +-
data/mods/markovoss/specification.xml | 120 +-
data/mods/misiulo/resources.properties | 68 +-
data/mods/monthSeasons/FreeColMessages.properties | 3 +
data/mods/monthSeasons/ModMessages.properties | 12 +
data/mods/monthSeasons/mod.xml | 1 +
data/mods/monthSeasons/specification.xml | 12 +
data/mods/plantForest/FreeColMessages.properties | 6 +-
data/mods/plantForest/ModMessages.properties | 11 +
data/mods/plantForest/resources.properties | 8 +-
data/mods/plantForest/specification.xml | 22 +-
data/mods/weekSeasons/FreeColMessages.properties | 3 +
data/mods/weekSeasons/ModMessages.properties | 52 +
data/mods/weekSeasons/mod.xml | 1 +
data/mods/weekSeasons/specification.xml | 12 +
data/rules/classic/resources.properties | 2703 ++++----
.../images/buildings/blacksmiths_shop.png | Bin 13199 -> 13795 bytes
.../images/buildings/spanish_townhall.png | Bin 0 -> 16538 bytes
.../images/buildings/tobacconists_house.png | Bin 18933 -> 20892 bytes
.../resources/images/forest/boreal/boreal.png | Bin 15591 -> 11005 bytes
.../resources/images/forest/boreal/boreal0001.png | Bin 15863 -> 8049 bytes
.../resources/images/forest/boreal/boreal0010.png | Bin 15917 -> 10066 bytes
.../resources/images/forest/boreal/boreal0011.png | Bin 15985 -> 8271 bytes
.../resources/images/forest/boreal/boreal0100.png | Bin 15858 -> 9696 bytes
.../resources/images/forest/boreal/boreal0101.png | Bin 15932 -> 7994 bytes
.../resources/images/forest/boreal/boreal0110.png | Bin 15862 -> 9227 bytes
.../resources/images/forest/boreal/boreal0111.png | Bin 15926 -> 6022 bytes
.../resources/images/forest/boreal/boreal1000.png | Bin 15883 -> 7321 bytes
.../resources/images/forest/boreal/boreal1001.png | Bin 15907 -> 5809 bytes
.../resources/images/forest/boreal/boreal1010.png | Bin 15989 -> 6652 bytes
.../resources/images/forest/boreal/boreal1011.png | Bin 15986 -> 5740 bytes
.../resources/images/forest/boreal/boreal1100.png | Bin 15927 -> 6474 bytes
.../resources/images/forest/boreal/boreal1101.png | Bin 15943 -> 3934 bytes
.../resources/images/forest/boreal/boreal1110.png | Bin 15925 -> 5562 bytes
.../resources/images/forest/boreal/boreal1111.png | Bin 15928 -> 4227 bytes
.../images/forest/broadleaf/broadleaf.png | Bin 17715 -> 19744 bytes
.../images/forest/broadleaf/broadleaf0001.png | Bin 18094 -> 14142 bytes
.../images/forest/broadleaf/broadleaf0010.png | Bin 17975 -> 17584 bytes
.../images/forest/broadleaf/broadleaf0011.png | Bin 18161 -> 13286 bytes
.../images/forest/broadleaf/broadleaf0100.png | Bin 18017 -> 17114 bytes
.../images/forest/broadleaf/broadleaf0101.png | Bin 18196 -> 13553 bytes
.../images/forest/broadleaf/broadleaf0110.png | Bin 18052 -> 16055 bytes
.../images/forest/broadleaf/broadleaf0111.png | Bin 18227 -> 11538 bytes
.../images/forest/broadleaf/broadleaf1000.png | Bin 17920 -> 12223 bytes
.../images/forest/broadleaf/broadleaf1001.png | Bin 18162 -> 11076 bytes
.../images/forest/broadleaf/broadleaf1010.png | Bin 17983 -> 12812 bytes
.../images/forest/broadleaf/broadleaf1011.png | Bin 18205 -> 10733 bytes
.../images/forest/broadleaf/broadleaf1100.png | Bin 18023 -> 11849 bytes
.../images/forest/broadleaf/broadleaf1101.png | Bin 18236 -> 8963 bytes
.../images/forest/broadleaf/broadleaf1110.png | Bin 18044 -> 10596 bytes
.../images/forest/broadleaf/broadleaf1111.png | Bin 18248 -> 8137 bytes
.../resources/images/forest/conifer/conifer.png | Bin 15542 -> 15476 bytes
.../images/forest/conifer/conifer0001.png | Bin 15855 -> 11594 bytes
.../images/forest/conifer/conifer0010.png | Bin 15880 -> 13328 bytes
.../images/forest/conifer/conifer0011.png | Bin 16080 -> 11140 bytes
.../images/forest/conifer/conifer0100.png | Bin 15716 -> 12452 bytes
.../images/forest/conifer/conifer0101.png | Bin 15921 -> 11487 bytes
.../images/forest/conifer/conifer0110.png | Bin 15916 -> 11637 bytes
.../images/forest/conifer/conifer0111.png | Bin 16111 -> 9265 bytes
.../images/forest/conifer/conifer1000.png | Bin 15937 -> 11076 bytes
.../images/forest/conifer/conifer1001.png | Bin 16025 -> 9624 bytes
.../images/forest/conifer/conifer1010.png | Bin 16141 -> 9741 bytes
.../images/forest/conifer/conifer1011.png | Bin 16223 -> 8638 bytes
.../images/forest/conifer/conifer1100.png | Bin 16013 -> 10415 bytes
.../images/forest/conifer/conifer1101.png | Bin 16084 -> 9278 bytes
.../images/forest/conifer/conifer1110.png | Bin 16173 -> 8976 bytes
.../images/forest/conifer/conifer1111.png | Bin 16241 -> 7418 bytes
.../resources/images/forest/mixed/mixed.png | Bin 16957 -> 17201 bytes
.../resources/images/forest/mixed/mixed0001.png | Bin 17864 -> 12729 bytes
.../resources/images/forest/mixed/mixed0010.png | Bin 17317 -> 15142 bytes
.../resources/images/forest/mixed/mixed0011.png | Bin 18017 -> 11903 bytes
.../resources/images/forest/mixed/mixed0100.png | Bin 17201 -> 14350 bytes
.../resources/images/forest/mixed/mixed0101.png | Bin 17920 -> 13383 bytes
.../resources/images/forest/mixed/mixed0110.png | Bin 17314 -> 14215 bytes
.../resources/images/forest/mixed/mixed0111.png | Bin 18019 -> 11925 bytes
.../resources/images/forest/mixed/mixed1000.png | Bin 17421 -> 12643 bytes
.../resources/images/forest/mixed/mixed1001.png | Bin 18005 -> 11216 bytes
.../resources/images/forest/mixed/mixed1010.png | Bin 17526 -> 11997 bytes
.../resources/images/forest/mixed/mixed1011.png | Bin 18108 -> 9588 bytes
.../resources/images/forest/mixed/mixed1100.png | Bin 17471 -> 11387 bytes
.../resources/images/forest/mixed/mixed1101.png | Bin 18055 -> 10268 bytes
.../resources/images/forest/mixed/mixed1110.png | Bin 17517 -> 11289 bytes
.../resources/images/forest/mixed/mixed1111.png | Bin 18100 -> 9133 bytes
.../classic/resources/images/forest/rain/rain.png | Bin 19451 -> 18131 bytes
.../resources/images/forest/rain/rain0001.png | Bin 19965 -> 14617 bytes
.../resources/images/forest/rain/rain0010.png | Bin 19669 -> 16058 bytes
.../resources/images/forest/rain/rain0011.png | Bin 20031 -> 10528 bytes
.../resources/images/forest/rain/rain0100.png | Bin 19792 -> 15911 bytes
.../resources/images/forest/rain/rain0101.png | Bin 20145 -> 11264 bytes
.../resources/images/forest/rain/rain0110.png | Bin 19824 -> 15177 bytes
.../resources/images/forest/rain/rain0111.png | Bin 20186 -> 10337 bytes
.../resources/images/forest/rain/rain1000.png | Bin 20042 -> 12273 bytes
.../resources/images/forest/rain/rain1001.png | Bin 20260 -> 9289 bytes
.../resources/images/forest/rain/rain1010.png | Bin 20109 -> 11746 bytes
.../resources/images/forest/rain/rain1011.png | Bin 20329 -> 8981 bytes
.../resources/images/forest/rain/rain1100.png | Bin 20223 -> 11789 bytes
.../resources/images/forest/rain/rain1101.png | Bin 20465 -> 8488 bytes
.../resources/images/forest/rain/rain1110.png | Bin 20267 -> 10514 bytes
.../resources/images/forest/rain/rain1111.png | Bin 20507 -> 8220 bytes
.../resources/images/forest/scrub/scrub.png | Bin 3528 -> 12113 bytes
.../resources/images/forest/scrub/scrub0001.png | Bin 2544 -> 10450 bytes
.../resources/images/forest/scrub/scrub0010.png | Bin 2686 -> 10520 bytes
.../resources/images/forest/scrub/scrub0011.png | Bin 2407 -> 9164 bytes
.../resources/images/forest/scrub/scrub0100.png | Bin 2667 -> 10845 bytes
.../resources/images/forest/scrub/scrub0101.png | Bin 2383 -> 9030 bytes
.../resources/images/forest/scrub/scrub0110.png | Bin 2529 -> 8905 bytes
.../resources/images/forest/scrub/scrub0111.png | Bin 2244 -> 7269 bytes
.../resources/images/forest/scrub/scrub1000.png | Bin 2531 -> 8981 bytes
.../resources/images/forest/scrub/scrub1001.png | Bin 2234 -> 9411 bytes
.../resources/images/forest/scrub/scrub1010.png | Bin 2366 -> 9897 bytes
.../resources/images/forest/scrub/scrub1011.png | Bin 2070 -> 6585 bytes
.../resources/images/forest/scrub/scrub1100.png | Bin 2370 -> 8921 bytes
.../resources/images/forest/scrub/scrub1101.png | Bin 2071 -> 7880 bytes
.../resources/images/forest/scrub/scrub1110.png | Bin 2207 -> 7678 bytes
.../resources/images/forest/scrub/scrub1111.png | Bin 1906 -> 6515 bytes
.../resources/images/forest/tropical/tropical.png | Bin 17487 -> 17417 bytes
.../images/forest/tropical/tropical0001.png | Bin 18018 -> 11594 bytes
.../images/forest/tropical/tropical0010.png | Bin 17769 -> 15006 bytes
.../images/forest/tropical/tropical0011.png | Bin 18073 -> 10928 bytes
.../images/forest/tropical/tropical0100.png | Bin 17714 -> 15183 bytes
.../images/forest/tropical/tropical0101.png | Bin 18017 -> 10571 bytes
.../images/forest/tropical/tropical0110.png | Bin 17776 -> 13109 bytes
.../images/forest/tropical/tropical0111.png | Bin 18078 -> 11256 bytes
.../images/forest/tropical/tropical1000.png | Bin 17935 -> 11054 bytes
.../images/forest/tropical/tropical1001.png | Bin 18394 -> 8991 bytes
.../images/forest/tropical/tropical1010.png | Bin 17993 -> 9622 bytes
.../images/forest/tropical/tropical1011.png | Bin 18447 -> 8174 bytes
.../images/forest/tropical/tropical1100.png | Bin 17946 -> 11520 bytes
.../images/forest/tropical/tropical1101.png | Bin 18395 -> 7621 bytes
.../images/forest/tropical/tropical1110.png | Bin 18003 -> 9112 bytes
.../images/forest/tropical/tropical1111.png | Bin 18449 -> 5833 bytes
.../resources/images/forest/wetland/wetland.png | Bin 13465 -> 13769 bytes
.../images/forest/wetland/wetland0001.png | Bin 14111 -> 9943 bytes
.../images/forest/wetland/wetland0010.png | Bin 13775 -> 11225 bytes
.../images/forest/wetland/wetland0011.png | Bin 14186 -> 9546 bytes
.../images/forest/wetland/wetland0100.png | Bin 13842 -> 11223 bytes
.../images/forest/wetland/wetland0101.png | Bin 14275 -> 9703 bytes
.../images/forest/wetland/wetland0110.png | Bin 13949 -> 10954 bytes
.../images/forest/wetland/wetland0111.png | Bin 14350 -> 7802 bytes
.../images/forest/wetland/wetland1000.png | Bin 13868 -> 9927 bytes
.../images/forest/wetland/wetland1001.png | Bin 14164 -> 8491 bytes
.../images/forest/wetland/wetland1010.png | Bin 13947 -> 8408 bytes
.../images/forest/wetland/wetland1011.png | Bin 14212 -> 7398 bytes
.../images/forest/wetland/wetland1100.png | Bin 14025 -> 8436 bytes
.../images/forest/wetland/wetland1101.png | Bin 14286 -> 6510 bytes
.../images/forest/wetland/wetland1110.png | Bin 14101 -> 7744 bytes
.../images/forest/wetland/wetland1111.png | Bin 14343 -> 6095 bytes
.../rules/classic/resources/images/goods/bells.png | Bin 1086 -> 1251 bytes
.../classic/resources/images/goods/crosses.png | Bin 183 -> 310 bytes
.../classic/resources/images/goods/hammers.png | Bin 483 -> 732 bytes
.../classic/resources/images/goods/tradeGoods.png | Bin 1533 -> 1647 bytes
.../images/mercenaries/Charles_Alexander.jpg | Bin 0 -> 12115 bytes
.../resources/images/mercenaries/Charles_I.jpg | Bin 0 -> 13522 bytes
.../images/mercenaries/Frederick_Augustus.jpg | Bin 0 -> 14294 bytes
.../resources/images/mercenaries/Frederik_II.jpg | Bin 0 -> 19378 bytes
.../classic}/resources/images/misc/placeholder.png | Bin
.../classic}/resources/images/misc/unitSelect.png | Bin
.../images/terrain/arctic/border_E_even.png | Bin 1325 -> 9489 bytes
.../images/terrain/arctic/border_E_odd.png | Bin 1319 -> 9282 bytes
.../images/terrain/arctic/border_NE_even.png | Bin 2075 -> 10060 bytes
.../images/terrain/arctic/border_NE_odd.png | Bin 2077 -> 9811 bytes
.../images/terrain/arctic/border_NW_even.png | Bin 2020 -> 10037 bytes
.../images/terrain/arctic/border_NW_odd.png | Bin 2010 -> 9794 bytes
.../images/terrain/arctic/border_N_even.png | Bin 1445 -> 9581 bytes
.../images/terrain/arctic/border_N_odd.png | Bin 1428 -> 9332 bytes
.../images/terrain/arctic/border_SE_even.png | Bin 2001 -> 10053 bytes
.../images/terrain/arctic/border_SE_odd.png | Bin 1972 -> 9837 bytes
.../images/terrain/arctic/border_SW_even.png | Bin 2013 -> 10028 bytes
.../images/terrain/arctic/border_SW_odd.png | Bin 1988 -> 9872 bytes
.../images/terrain/arctic/border_S_even.png | Bin 1410 -> 9570 bytes
.../images/terrain/arctic/border_S_odd.png | Bin 1413 -> 9391 bytes
.../images/terrain/arctic/border_W_even.png | Bin 1325 -> 9472 bytes
.../images/terrain/arctic/border_W_odd.png | Bin 1331 -> 9244 bytes
.../images/terrain/desert/border_E_even.png | Bin 1326 -> 9310 bytes
.../images/terrain/desert/border_E_odd.png | Bin 1327 -> 9310 bytes
.../images/terrain/desert/border_NE_even.png | Bin 2235 -> 10643 bytes
.../images/terrain/desert/border_NE_odd.png | Bin 2121 -> 10643 bytes
.../images/terrain/desert/border_NW_even.png | Bin 2075 -> 10623 bytes
.../images/terrain/desert/border_NW_odd.png | Bin 2051 -> 10623 bytes
.../images/terrain/desert/border_N_even.png | Bin 1422 -> 9276 bytes
.../images/terrain/desert/border_N_odd.png | Bin 1397 -> 9276 bytes
.../images/terrain/desert/border_SE_even.png | Bin 2047 -> 10641 bytes
.../images/terrain/desert/border_SE_odd.png | Bin 2090 -> 10641 bytes
.../images/terrain/desert/border_SW_even.png | Bin 2109 -> 10664 bytes
.../images/terrain/desert/border_SW_odd.png | Bin 2151 -> 10664 bytes
.../images/terrain/desert/border_S_even.png | Bin 1413 -> 9297 bytes
.../images/terrain/desert/border_S_odd.png | Bin 1409 -> 9297 bytes
.../images/terrain/desert/border_W_even.png | Bin 1335 -> 9324 bytes
.../images/terrain/desert/border_W_odd.png | Bin 1313 -> 9324 bytes
.../images/terrain/grassland/border_E_even.png | Bin 1320 -> 8433 bytes
.../images/terrain/grassland/border_E_odd.png | Bin 1324 -> 8383 bytes
.../images/terrain/grassland/border_NE_even.png | Bin 2032 -> 9049 bytes
.../images/terrain/grassland/border_NE_odd.png | Bin 2022 -> 8992 bytes
.../images/terrain/grassland/border_NW_even.png | Bin 2088 -> 8961 bytes
.../images/terrain/grassland/border_NW_odd.png | Bin 1945 -> 8974 bytes
.../images/terrain/grassland/border_N_even.png | Bin 1427 -> 8518 bytes
.../images/terrain/grassland/border_N_odd.png | Bin 1390 -> 8512 bytes
.../images/terrain/grassland/border_SE_even.png | Bin 2032 -> 9029 bytes
.../images/terrain/grassland/border_SE_odd.png | Bin 2066 -> 8955 bytes
.../images/terrain/grassland/border_SW_even.png | Bin 1995 -> 9072 bytes
.../images/terrain/grassland/border_SW_odd.png | Bin 1987 -> 8979 bytes
.../images/terrain/grassland/border_S_even.png | Bin 1424 -> 8583 bytes
.../images/terrain/grassland/border_S_odd.png | Bin 1404 -> 8521 bytes
.../images/terrain/grassland/border_W_even.png | Bin 1326 -> 8411 bytes
.../images/terrain/grassland/border_W_odd.png | Bin 1309 -> 8430 bytes
.../images/terrain/highSeas/border_E_even.png | Bin 374 -> 9795 bytes
.../images/terrain/highSeas/border_E_odd.png | Bin 381 -> 9982 bytes
.../images/terrain/highSeas/border_NE_even.png | Bin 2241 -> 10732 bytes
.../images/terrain/highSeas/border_NE_odd.png | Bin 2141 -> 10978 bytes
.../images/terrain/highSeas/border_NW_even.png | Bin 2203 -> 10622 bytes
.../images/terrain/highSeas/border_NW_odd.png | Bin 2193 -> 11061 bytes
.../images/terrain/highSeas/border_N_even.png | Bin 626 -> 10006 bytes
.../images/terrain/highSeas/border_N_odd.png | Bin 648 -> 10253 bytes
.../images/terrain/highSeas/border_SE_even.png | Bin 2262 -> 10838 bytes
.../images/terrain/highSeas/border_SE_odd.png | Bin 2101 -> 10911 bytes
.../images/terrain/highSeas/border_SW_even.png | Bin 2093 -> 10564 bytes
.../images/terrain/highSeas/border_SW_odd.png | Bin 2202 -> 10913 bytes
.../images/terrain/highSeas/border_S_even.png | Bin 596 -> 9998 bytes
.../images/terrain/highSeas/border_S_odd.png | Bin 613 -> 10163 bytes
.../images/terrain/highSeas/border_W_even.png | Bin 381 -> 9768 bytes
.../images/terrain/highSeas/border_W_odd.png | Bin 368 -> 10079 bytes
.../resources/images/terrain/hills/hills2.png | Bin 0 -> 5396 bytes
.../resources/images/terrain/hills/hills3.png | Bin 0 -> 5606 bytes
.../images/terrain/marsh/border_E_even.png | Bin 1323 -> 10979 bytes
.../images/terrain/marsh/border_E_odd.png | Bin 1328 -> 11352 bytes
.../images/terrain/marsh/border_NE_even.png | Bin 2192 -> 11465 bytes
.../images/terrain/marsh/border_NE_odd.png | Bin 2137 -> 11829 bytes
.../images/terrain/marsh/border_NW_even.png | Bin 2149 -> 11397 bytes
.../images/terrain/marsh/border_NW_odd.png | Bin 2083 -> 11813 bytes
.../images/terrain/marsh/border_N_even.png | Bin 1428 -> 11055 bytes
.../images/terrain/marsh/border_N_odd.png | Bin 1388 -> 11443 bytes
.../images/terrain/marsh/border_SE_even.png | Bin 2115 -> 11450 bytes
.../images/terrain/marsh/border_SE_odd.png | Bin 2180 -> 11827 bytes
.../images/terrain/marsh/border_SW_even.png | Bin 2189 -> 11406 bytes
.../images/terrain/marsh/border_SW_odd.png | Bin 2095 -> 11833 bytes
.../images/terrain/marsh/border_S_even.png | Bin 1401 -> 11058 bytes
.../images/terrain/marsh/border_S_odd.png | Bin 1421 -> 11438 bytes
.../images/terrain/marsh/border_W_even.png | Bin 1338 -> 10971 bytes
.../images/terrain/marsh/border_W_odd.png | Bin 1310 -> 11346 bytes
.../images/terrain/mountains/mountains2.png | Bin 0 -> 6662 bytes
.../images/terrain/mountains/mountains3.png | Bin 0 -> 6310 bytes
.../images/terrain/ocean/border_E_even.png | Bin 369 -> 9177 bytes
.../images/terrain/ocean/border_E_odd.png | Bin 369 -> 8379 bytes
.../images/terrain/ocean/border_NE_even.png | Bin 2181 -> 9990 bytes
.../images/terrain/ocean/border_NE_odd.png | Bin 2058 -> 9873 bytes
.../images/terrain/ocean/border_NW_even.png | Bin 2011 -> 10275 bytes
.../images/terrain/ocean/border_NW_odd.png | Bin 1819 -> 10023 bytes
.../images/terrain/ocean/border_N_even.png | Bin 582 -> 9398 bytes
.../images/terrain/ocean/border_N_odd.png | Bin 511 -> 8829 bytes
.../images/terrain/ocean/border_SE_even.png | Bin 2072 -> 9934 bytes
.../images/terrain/ocean/border_SE_odd.png | Bin 2154 -> 9123 bytes
.../images/terrain/ocean/border_SW_even.png | Bin 2227 -> 10207 bytes
.../images/terrain/ocean/border_SW_odd.png | Bin 2093 -> 9478 bytes
.../images/terrain/ocean/border_S_even.png | Bin 565 -> 9376 bytes
.../images/terrain/ocean/border_S_odd.png | Bin 565 -> 8381 bytes
.../images/terrain/ocean/border_W_even.png | Bin 388 -> 9204 bytes
.../images/terrain/ocean/border_W_odd.png | Bin 314 -> 8395 bytes
.../images/terrain/plains/border_E_even.png | Bin 1331 -> 11470 bytes
.../images/terrain/plains/border_E_odd.png | Bin 1327 -> 11638 bytes
.../images/terrain/plains/border_NE_even.png | Bin 2179 -> 11991 bytes
.../images/terrain/plains/border_NE_odd.png | Bin 2181 -> 12129 bytes
.../images/terrain/plains/border_NW_even.png | Bin 2170 -> 11939 bytes
.../images/terrain/plains/border_NW_odd.png | Bin 2171 -> 12073 bytes
.../images/terrain/plains/border_N_even.png | Bin 1476 -> 11547 bytes
.../images/terrain/plains/border_N_odd.png | Bin 1457 -> 11690 bytes
.../images/terrain/plains/border_SE_even.png | Bin 2178 -> 11943 bytes
.../images/terrain/plains/border_SE_odd.png | Bin 2137 -> 12114 bytes
.../images/terrain/plains/border_SW_even.png | Bin 2177 -> 11917 bytes
.../images/terrain/plains/border_SW_odd.png | Bin 2190 -> 12097 bytes
.../images/terrain/plains/border_S_even.png | Bin 1430 -> 11549 bytes
.../images/terrain/plains/border_S_odd.png | Bin 1435 -> 11688 bytes
.../images/terrain/plains/border_W_even.png | Bin 1328 -> 11463 bytes
.../images/terrain/plains/border_W_odd.png | Bin 1331 -> 11593 bytes
.../images/terrain/prairie/border_E_even.png | Bin 1325 -> 10157 bytes
.../images/terrain/prairie/border_E_odd.png | Bin 1321 -> 16316 bytes
.../images/terrain/prairie/border_NE_even.png | Bin 2049 -> 10732 bytes
.../images/terrain/prairie/border_NE_odd.png | Bin 2102 -> 17017 bytes
.../images/terrain/prairie/border_NW_even.png | Bin 2021 -> 10678 bytes
.../images/terrain/prairie/border_NW_odd.png | Bin 1950 -> 16974 bytes
.../images/terrain/prairie/border_N_even.png | Bin 1435 -> 10242 bytes
.../images/terrain/prairie/border_N_odd.png | Bin 1404 -> 16470 bytes
.../images/terrain/prairie/border_SE_even.png | Bin 1902 -> 10734 bytes
.../images/terrain/prairie/border_SE_odd.png | Bin 1936 -> 17007 bytes
.../images/terrain/prairie/border_SW_even.png | Bin 2004 -> 10721 bytes
.../images/terrain/prairie/border_SW_odd.png | Bin 1963 -> 17030 bytes
.../images/terrain/prairie/border_S_even.png | Bin 1415 -> 10277 bytes
.../images/terrain/prairie/border_S_odd.png | Bin 1403 -> 16447 bytes
.../images/terrain/prairie/border_W_even.png | Bin 1324 -> 10146 bytes
.../images/terrain/prairie/border_W_odd.png | Bin 1338 -> 16324 bytes
.../images/terrain/savannah/border_E_even.png | Bin 1326 -> 11406 bytes
.../images/terrain/savannah/border_E_odd.png | Bin 1326 -> 11020 bytes
.../images/terrain/savannah/border_NE_even.png | Bin 2243 -> 11996 bytes
.../images/terrain/savannah/border_NE_odd.png | Bin 2153 -> 11863 bytes
.../images/terrain/savannah/border_NW_even.png | Bin 2138 -> 11898 bytes
.../images/terrain/savannah/border_NW_odd.png | Bin 2071 -> 11478 bytes
.../images/terrain/savannah/border_N_even.png | Bin 1422 -> 11508 bytes
.../images/terrain/savannah/border_N_odd.png | Bin 1403 -> 11092 bytes
.../images/terrain/savannah/border_SE_even.png | Bin 2131 -> 11939 bytes
.../images/terrain/savannah/border_SE_odd.png | Bin 2137 -> 11814 bytes
.../images/terrain/savannah/border_SW_even.png | Bin 2173 -> 11863 bytes
.../images/terrain/savannah/border_SW_odd.png | Bin 2162 -> 11623 bytes
.../images/terrain/savannah/border_S_even.png | Bin 1415 -> 11480 bytes
.../images/terrain/savannah/border_S_odd.png | Bin 1409 -> 11146 bytes
.../images/terrain/savannah/border_W_even.png | Bin 1338 -> 11375 bytes
.../images/terrain/savannah/border_W_odd.png | Bin 1312 -> 10905 bytes
.../images/terrain/swamp/border_E_even.png | Bin 1326 -> 11183 bytes
.../images/terrain/swamp/border_E_odd.png | Bin 1321 -> 9958 bytes
.../images/terrain/swamp/border_NE_even.png | Bin 1942 -> 11858 bytes
.../images/terrain/swamp/border_NE_odd.png | Bin 1948 -> 11002 bytes
.../images/terrain/swamp/border_NW_even.png | Bin 1942 -> 11833 bytes
.../images/terrain/swamp/border_NW_odd.png | Bin 1945 -> 10922 bytes
.../images/terrain/swamp/border_N_even.png | Bin 1416 -> 11379 bytes
.../images/terrain/swamp/border_N_odd.png | Bin 1412 -> 10218 bytes
.../images/terrain/swamp/border_SE_even.png | Bin 1908 -> 11936 bytes
.../images/terrain/swamp/border_SE_odd.png | Bin 1870 -> 10780 bytes
.../images/terrain/swamp/border_SW_even.png | Bin 1897 -> 12001 bytes
.../images/terrain/swamp/border_SW_odd.png | Bin 1899 -> 10857 bytes
.../images/terrain/swamp/border_S_even.png | Bin 1399 -> 11461 bytes
.../images/terrain/swamp/border_S_odd.png | Bin 1400 -> 10148 bytes
.../images/terrain/swamp/border_W_even.png | Bin 1322 -> 11186 bytes
.../images/terrain/swamp/border_W_odd.png | Bin 1324 -> 9965 bytes
.../images/terrain/tundra/border_E_even.png | Bin 1343 -> 13620 bytes
.../images/terrain/tundra/border_E_odd.png | Bin 1335 -> 13735 bytes
.../images/terrain/tundra/border_NE_even.png | Bin 2253 -> 14239 bytes
.../images/terrain/tundra/border_NE_odd.png | Bin 2204 -> 14341 bytes
.../images/terrain/tundra/border_NW_even.png | Bin 2102 -> 14228 bytes
.../images/terrain/tundra/border_NW_odd.png | Bin 2196 -> 14321 bytes
.../images/terrain/tundra/border_N_even.png | Bin 1479 -> 13749 bytes
.../images/terrain/tundra/border_N_odd.png | Bin 1468 -> 13828 bytes
.../images/terrain/tundra/border_SE_even.png | Bin 2158 -> 14206 bytes
.../images/terrain/tundra/border_SE_odd.png | Bin 2046 -> 14340 bytes
.../images/terrain/tundra/border_SW_even.png | Bin 2138 -> 14205 bytes
.../images/terrain/tundra/border_SW_odd.png | Bin 2175 -> 14317 bytes
.../images/terrain/tundra/border_S_even.png | Bin 1453 -> 13735 bytes
.../images/terrain/tundra/border_S_odd.png | Bin 1454 -> 13826 bytes
.../images/terrain/tundra/border_W_even.png | Bin 1340 -> 13614 bytes
.../images/terrain/tundra/border_W_odd.png | Bin 1341 -> 13718 bytes
.../images/terrain/unexplored/border_E_even.png | Bin 754 -> 754 bytes
.../images/terrain/unexplored/border_E_odd.png | Bin 754 -> 754 bytes
.../images/terrain/unexplored/border_NE_even.png | Bin 800 -> 800 bytes
.../images/terrain/unexplored/border_NE_odd.png | Bin 800 -> 800 bytes
.../images/terrain/unexplored/border_NW_even.png | Bin 824 -> 824 bytes
.../images/terrain/unexplored/border_NW_odd.png | Bin 824 -> 824 bytes
.../images/terrain/unexplored/border_N_even.png | Bin 1027 -> 1027 bytes
.../images/terrain/unexplored/border_N_odd.png | Bin 1027 -> 1027 bytes
.../images/terrain/unexplored/border_SE_even.png | Bin 830 -> 830 bytes
.../images/terrain/unexplored/border_SE_odd.png | Bin 830 -> 830 bytes
.../images/terrain/unexplored/border_SW_even.png | Bin 817 -> 817 bytes
.../images/terrain/unexplored/border_SW_odd.png | Bin 817 -> 817 bytes
.../images/terrain/unexplored/border_S_even.png | Bin 966 -> 966 bytes
.../images/terrain/unexplored/border_S_odd.png | Bin 966 -> 966 bytes
.../images/terrain/unexplored/border_W_even.png | Bin 725 -> 725 bytes
.../images/terrain/unexplored/border_W_odd.png | Bin 725 -> 725 bytes
.../classic}/resources/images/ui/README | 0
.../classic/resources/images/ui/bg_europe.jpg | Bin 87016 -> 0 bytes
.../resources/images/ui/closed_section.png | Bin
.../resources/images/ui/closed_section_125pct.png | Bin 0 -> 2425 bytes
.../classic}/resources/images/ui/compass.png | Bin
.../classic}/resources/images/ui/freecol2.png | Bin
.../resources/images/ui/infopanel-skin_120pct.png | Bin 0 -> 139274 bytes
.../classic}/resources/images/ui/lock.png | Bin
.../classic/resources/images/ui/map-americas.png | Bin 3737 -> 0 bytes
.../classic}/resources/images/ui/map.jpg | Bin
.../classic/resources/images/ui/meet_europeans.png | Bin 2448 -> 0 bytes
.../classic/resources/images/ui/meet_inca.png | Bin 2844 -> 188749 bytes
.../classic}/resources/images/ui/open_section.png | Bin
.../resources/images/ui/open_section_120pct.png | Bin 0 -> 2536 bytes
.../order-buttons/disabled/toggle_fog_of_war.png | Bin 0 -> 2833 bytes
.../disabled/toggle_fog_of_war_no.png | Bin 0 -> 2833 bytes
.../disabled/toggle_view_economic.png | Bin 0 -> 2833 bytes
.../disabled/toggle_view_politics.png | Bin 0 -> 2833 bytes
.../highlighted/toggle_fog_of_war.png | Bin 0 -> 3916 bytes
.../highlighted/toggle_fog_of_war_no.png | Bin 0 -> 4132 bytes
.../highlighted/toggle_view_economic.png | Bin 0 -> 3551 bytes
.../highlighted/toggle_view_politics.png | Bin 0 -> 3926 bytes
.../ui/order-buttons/normal/toggle_fog_of_war.png | Bin 0 -> 3826 bytes
.../order-buttons/normal/toggle_fog_of_war_no.png | Bin 0 -> 3858 bytes
.../order-buttons/normal/toggle_view_economic.png | Bin 0 -> 3394 bytes
.../order-buttons/normal/toggle_view_politics.png | Bin 0 -> 3405 bytes
.../ui/order-buttons/pressed/toggle_fog_of_war.png | Bin 0 -> 3826 bytes
.../order-buttons/pressed/toggle_fog_of_war_no.png | Bin 0 -> 3858 bytes
.../order-buttons/pressed/toggle_view_economic.png | Bin 0 -> 3394 bytes
.../order-buttons/pressed/toggle_view_politics.png | Bin 0 -> 3405 bytes
.../images/units/{soldier => armedBrave}/brave.png | Bin
.../units/{dragoon => cavalry}/kingsRegular.png | Bin
.../images/units/{ => civilian}/brave.png | Bin
.../units/{ => civilian}/colonialRegular.png | Bin
.../images/units/{ => civilian}/elderStatesman.png | Bin
.../images/units/{ => civilian}/expertFarmer.png | Bin
.../units/{ => civilian}/expertFisherman.png | Bin
.../units/{ => civilian}/expertFurTrapper.png | Bin
.../units/{ => civilian}/expertLumberJack.png | Bin
.../images/units/{ => civilian}/expertOreMiner.png | Bin
.../units/{ => civilian}/expertSilverMiner.png | Bin
.../units/{ => civilian}/firebrandPreacher.png | Bin
.../images/units/{ => civilian}/freeColonist.png | Bin
.../images/units/{ => civilian}/hardyPioneer.png | Bin
.../units/{ => civilian}/indenturedServant.png | Bin
.../images/units/{ => civilian}/indianConvert.png | Bin
.../units/{ => civilian}/jesuitMissionary.png | Bin
.../images/units/{ => civilian}/kingsRegular.png | Bin
.../units/{ => civilian}/masterBlacksmith.png | Bin
.../units/{ => civilian}/masterCarpenter.png | Bin
.../units/{ => civilian}/masterCottonPlanter.png | Bin
.../units/{ => civilian}/masterDistiller.png | Bin
.../units/{ => civilian}/masterFurTrader.png | Bin
.../images/units/{ => civilian}/masterGunsmith.png | Bin
.../units/{ => civilian}/masterSugarPlanter.png | Bin
.../units/{ => civilian}/masterTobaccoPlanter.png | Bin
.../units/{ => civilian}/masterTobacconist.png | Bin
.../images/units/{ => civilian}/masterWeaver.png | Bin
.../images/units/{ => civilian}/milkmaid.png | Bin
.../images/units/{ => civilian}/nativeColonist.png | Bin
.../images/units/{ => civilian}/pettyCriminal.png | Bin
.../images/units/{ => civilian}/revenger.png | Bin
.../images/units/{ => civilian}/seasonedScout.png | Bin
.../images/units/{ => civilian}/undead.png | Bin
.../resources/images/units/{ => civilian}/unit.png | Bin
.../images/units/{ => civilian}/veteranSoldier.png | Bin
.../units/{soldier => infantry}/kingsRegular.png | Bin
.../images/units/{scout => mountedBrave}/brave.png | Bin
.../units/{dragoon => nativeDragoon}/brave.png | Bin
.../resources/images/units/{ => ship}/caravel.png | Bin
.../images/units/{ => ship}/flyingDutchman.png | Bin
.../resources/images/units/ship/frigate-attack.sza | Bin 0 -> 147879 bytes
.../resources/images/units/{ => ship}/frigate.png | Bin
.../resources/images/units/{ => ship}/galleon.png | Bin
.../resources/images/units/{ => ship}/manOWar.png | Bin
.../images/units/{ => ship}/merchantman.png | Bin
.../images/units/ship/privateer-attack.sza | Bin 0 -> 83788 bytes
.../images/units/{ => ship}/privateer.png | Bin
.../images/units/{ => soldier}/nativeSoldier.png | Bin
.../images/units/wagon/artillery-attack.sza | Bin 0 -> 55689 bytes
.../images/units/{ => wagon}/artillery.png | Bin
.../images/units/wagon/damagedArtillery-attack.sza | Bin 0 -> 47611 bytes
.../images/units/{ => wagon}/damagedArtillery.png | Bin
.../images/units/{ => wagon}/treasureTrain.png | Bin
.../images/units/{ => wagon}/wagonTrain.png | Bin
.../classic/resources/sound/{ => event}/README | 0
.../classic/resources/sound/{ => event}/alert.ogg | Bin
.../resources/sound/{ => event}/building.ogg | Bin
.../classic/resources/sound/{ => event}/colony.ogg | Bin
.../resources/sound/{ => event}/fountain.ogg | Bin
.../classic/resources/sound/event}/illegal.ogg | Bin
.../classic/resources/sound/{ => event}/load.ogg | Bin
.../resources/sound/{ => event}/mission.ogg | Bin
.../classic/resources/sound/{ => event}/sell.ogg | Bin
.../classic/resources/sound/{ => event}/sunk.ogg | Bin
data/rules/classic/specification.xml | 4760 +++++++++-----
data/rules/freecol/resources.properties | 34 +-
data/rules/freecol/specification.xml | 213 +-
data/rules/testing/specification.xml | 98 +-
data/strings/FreeColMessages.properties | 6217 ++++++++++--------
data/strings/FreeColMessages_af.properties | 3346 +++++-----
data/strings/FreeColMessages_ang.properties | 3723 ++++++-----
data/strings/FreeColMessages_ar.properties | 3140 +++++----
data/strings/FreeColMessages_arz.properties | 2862 ++++----
data/strings/FreeColMessages_be-tarask.properties | 3952 ++++++-----
data/strings/FreeColMessages_bg.properties | 139 +-
data/strings/FreeColMessages_br.properties | 4754 ++++++++------
data/strings/FreeColMessages_bs.properties | 394 +-
data/strings/FreeColMessages_ca.properties | 4552 +++++++------
data/strings/FreeColMessages_cs_CZ.properties | 4836 ++++++++------
data/strings/FreeColMessages_da.properties | 4469 +++++++------
data/strings/FreeColMessages_de.properties | 4820 ++++++++------
data/strings/FreeColMessages_el.properties | 2175 +++----
data/strings/FreeColMessages_en_GB.properties | 10 +-
data/strings/FreeColMessages_eo.properties | 4171 ++++++------
data/strings/FreeColMessages_es_ES.properties | 4760 ++++++++------
data/strings/FreeColMessages_et.properties | 133 +-
data/strings/FreeColMessages_eu.properties | 150 +-
data/strings/FreeColMessages_fa.properties | 204 +-
data/strings/FreeColMessages_fi.properties | 3281 +++++-----
data/strings/FreeColMessages_fr.properties | 5024 +++++++-------
data/strings/FreeColMessages_gl.properties | 4341 +++++++------
data/strings/FreeColMessages_grc.properties | 109 +-
data/strings/FreeColMessages_he.properties | 2345 ++++---
data/strings/FreeColMessages_hsb.properties | 2864 ++++----
data/strings/FreeColMessages_hu.properties | 3742 +++++------
data/strings/FreeColMessages_ia.properties | 4463 +++++++------
data/strings/FreeColMessages_id.properties | 135 +-
data/strings/FreeColMessages_it_IT.properties | 4358 +++++++------
data/strings/FreeColMessages_ja.properties | 4088 ++++++------
data/strings/FreeColMessages_km.properties | 131 +-
data/strings/FreeColMessages_ko.properties | 2117 +++---
data/strings/FreeColMessages_lt.properties | 3808 +++++------
data/strings/FreeColMessages_mk.properties | 6069 ++++++++++-------
data/strings/FreeColMessages_ms.properties | 4543 +++++++------
data/strings/FreeColMessages_nb_NO.properties | 376 +-
data/strings/FreeColMessages_nds.properties | 106 +-
data/strings/FreeColMessages_nl.properties | 4759 +++++++-------
data/strings/FreeColMessages_nl_BE.properties | 3408 +++++-----
data/strings/FreeColMessages_nn.properties | 11 +-
data/strings/FreeColMessages_oc.properties | 4148 +++++++-----
data/strings/FreeColMessages_pl_PL.properties | 4419 +++++++------
data/strings/FreeColMessages_pms.properties | 17 +-
data/strings/FreeColMessages_pt_BR.properties | 4312 +++++++-----
data/strings/FreeColMessages_pt_PT.properties | 4188 ++++++------
data/strings/FreeColMessages_qqq.properties | 875 ++-
data/strings/FreeColMessages_ru.properties | 4896 ++++++++------
data/strings/FreeColMessages_sk.properties | 2924 +++++++++
data/strings/FreeColMessages_sq.properties | 7 +-
data/strings/FreeColMessages_sv_SE.properties | 4300 ++++++------
data/strings/FreeColMessages_ta.properties | 148 +-
data/strings/FreeColMessages_tl.properties | 4239 ++++++------
data/strings/FreeColMessages_tr.properties | 1486 +++--
data/strings/FreeColMessages_uk.properties | 4592 +++++++------
data/strings/FreeColMessages_zh-hant.properties | 2110 ++++++
data/strings/FreeColMessages_zh_CN.properties | 4844 ++++++++------
data/strings/plurals.xml | 4 +-
doc/FreeCol.aux | 548 --
doc/FreeCol.idx | 427 --
doc/FreeCol.ilg | 6 -
doc/FreeCol.ind | 501 --
doc/FreeCol.log | 515 --
doc/FreeCol.out | 69 -
doc/FreeCol.pdf | Bin 3813453 -> 0 bytes
doc/FreeCol.tex | 306 +-
doc/FreeCol.toc | 80 -
doc/developer.tex | 577 +-
doc/specification.css | 54 +
doc/specification.xsl | 748 +++
doc/version.sty | 4 +
freecol | 82 -
freecol.cmd | 1 -
freecol.xpm | 291 -
packaging/common/README | 4 +-
packaging/common/freecol.appdata.xml | 28 +
packaging/common/freecol.desktop | 10 +
packaging/common/freecol.sh | 2 +-
packaging/debian/README.Debian | 22 -
packaging/debian/changelog | 6 -
packaging/debian/compat | 1 -
packaging/debian/control | 18 -
packaging/debian/copyright | 14 -
packaging/debian/dirs | 4 -
packaging/debian/docs | 3 -
packaging/debian/freecol.6 | 66 -
packaging/debian/freecol.sh | 40 -
packaging/debian/manpages | 1 -
packaging/debian/menu | 2 -
packaging/debian/rules | 27 -
packaging/gentoo/freecol-0.3.0.ebuild | 52 -
packaging/targz/create_src_tar_gz.sh | 2 +-
packaging/targz/create_tar_gz.sh | 2 +-
packaging/targz/create_zip.sh | 2 +-
schema/data/data-aiMain.xsd | 76 +-
schema/data/data-building.xsd | 44 +-
schema/data/data-colony.xsd | 95 +-
schema/data/data-colonyTile.xsd | 38 +-
schema/data/data-common.xsd | 76 +-
schema/data/data-equipment.xsd | 3 +-
schema/data/data-europe.xsd | 44 +-
schema/data/data-exportData.xsd | 2 +-
schema/data/data-game.xsd | 54 +-
schema/data/data-goods.xsd | 2 +-
schema/data/data-goodsContainer.xsd | 41 +-
schema/data/data-historyEvent.xsd | 2 +-
schema/data/data-indianSettlement.xsd | 12 +-
schema/data/data-lostCityRumour.xsd | 7 +-
schema/data/data-map.xsd | 16 +-
schema/data/data-market.xsd | 44 +-
schema/data/data-modelMessage.xsd | 21 +-
schema/data/data-modifier.xsd | 15 +-
schema/data/data-monarch.xsd | 18 +-
schema/data/data-nationOptions.xsd | 29 +-
schema/data/data-player.xsd | 70 +-
schema/data/data-playerExploredTile.xsd | 8 +-
schema/data/data-region.xsd | 27 +-
schema/data/data-resource.xsd | 57 +-
schema/data/data-savedGame.xsd | 3 +-
schema/data/data-serverObjects.xsd | 24 +-
schema/data/data-specification.xsd | 505 +-
schema/data/data-stringTemplate.xsd | 11 +-
schema/data/data-template.xsd | 2 +-
schema/data/data-tile.xsd | 14 +-
schema/data/data-tileimprovement.xsd | 36 +-
schema/data/data-tileitemcontainer.xsd | 39 +-
schema/data/data-tradeRoute.xsd | 67 +-
schema/data/data-unit.xsd | 64 +-
schema/data/data.xsd | 2 +-
schema/specification-schema.xsd | 1280 ++--
src/MANIFEST.MF | 11 +-
src/net/sf/freecol/FreeCol.java | 1563 +++--
src/net/sf/freecol/client/ClientOptions.java | 855 +--
src/net/sf/freecol/client/FreeColClient.java | 915 +--
src/net/sf/freecol/client/Worker.java | 15 +-
.../freecol/client/control/ConnectController.java | 862 +--
.../freecol/client/control/InGameController.java | 6866 +++++++++++---------
.../freecol/client/control/InGameInputHandler.java | 2306 ++-----
.../sf/freecol/client/control/InputHandler.java | 38 +-
.../client/control/MapEditorController.java | 283 +-
.../freecol/client/control/PreGameController.java | 177 +-
.../client/control/PreGameInputHandler.java | 123 +-
.../sf/freecol/client/control/SoundController.java | 131 +
.../freecol/client/gui/AbstractCanvasListener.java | 154 +-
src/net/sf/freecol/client/gui/Canvas.java | 3825 ++++++-----
.../client/gui/CanvasMapEditorMouseListener.java | 323 +-
.../sf/freecol/client/gui/CanvasMouseListener.java | 159 +-
.../client/gui/CanvasMouseMotionListener.java | 80 +-
src/net/sf/freecol/client/gui/ChatDisplay.java | 147 +
src/net/sf/freecol/client/gui/ChoiceItem.java | 216 +
src/net/sf/freecol/client/gui/DialogHandler.java | 30 +
src/net/sf/freecol/client/gui/FontLibrary.java | 298 +
.../sf/freecol/client/gui/FrameMotionListener.java | 37 +-
src/net/sf/freecol/client/gui/FreeColFrame.java | 193 +-
src/net/sf/freecol/client/gui/FullScreenFrame.java | 72 -
.../client/gui/FullScreenFrameListener.java | 125 +
src/net/sf/freecol/client/gui/GUI.java | 1844 +++---
src/net/sf/freecol/client/gui/GUIMessage.java | 44 +-
src/net/sf/freecol/client/gui/GrayLayer.java | 116 +-
src/net/sf/freecol/client/gui/ImageLibrary.java | 1662 ++---
.../sf/freecol/client/gui/LoadingSavegameInfo.java | 64 +
src/net/sf/freecol/client/gui/MapViewer.java | 4067 +++++-------
src/net/sf/freecol/client/gui/MessageLabel.java | 38 -
.../client/gui/OutForAnimationCallback.java | 29 +-
src/net/sf/freecol/client/gui/RoadPainter.java | 160 +
src/net/sf/freecol/client/gui/ScrollThread.java | 88 +-
src/net/sf/freecol/client/gui/SwingGUI.java | 1639 +++++
src/net/sf/freecol/client/gui/TerrainCursor.java | 87 +-
src/net/sf/freecol/client/gui/TilePopup.java | 401 +-
src/net/sf/freecol/client/gui/TileViewer.java | 789 +++
src/net/sf/freecol/client/gui/WindowedFrame.java | 73 -
.../freecol/client/gui/WindowedFrameListener.java | 19 +-
.../sf/freecol/client/gui/action/AboutAction.java | 24 +-
.../freecol/client/gui/action/ActionManager.java | 206 +-
.../client/gui/action/AssignTradeRouteAction.java | 40 +-
.../client/gui/action/BuildColonyAction.java | 43 +-
.../sf/freecol/client/gui/action/CenterAction.java | 24 +-
.../sf/freecol/client/gui/action/ChangeAction.java | 87 +-
.../gui/action/ChangeWindowedModeAction.java | 43 +-
.../sf/freecol/client/gui/action/ChatAction.java | 35 +-
.../client/gui/action/ClearOrdersAction.java | 27 +-
.../freecol/client/gui/action/ColopediaAction.java | 41 +-
.../freecol/client/gui/action/ContinueAction.java | 45 +-
.../sf/freecol/client/gui/action/DebugAction.java | 43 +-
.../gui/action/DeclareIndependenceAction.java | 39 +-
.../client/gui/action/DetermineHighSeasAction.java | 45 +-
.../client/gui/action/DisbandUnitAction.java | 27 +-
.../client/gui/action/DisplayBordersAction.java | 27 +-
.../client/gui/action/DisplayGridAction.java | 27 +-
.../client/gui/action/DisplayTileTextAction.java | 66 +-
.../freecol/client/gui/action/EndTurnAction.java | 30 +-
.../sf/freecol/client/gui/action/EuropeAction.java | 30 +-
.../client/gui/action/ExecuteGotoOrdersAction.java | 25 +-
.../client/gui/action/FindSettlementAction.java | 23 +-
.../freecol/client/gui/action/FortifyAction.java | 38 +-
.../freecol/client/gui/action/FreeColAction.java | 395 +-
.../sf/freecol/client/gui/action/GotoAction.java | 45 +-
.../freecol/client/gui/action/GotoTileAction.java | 35 +-
.../client/gui/action/ImprovementAction.java | 60 +-
.../sf/freecol/client/gui/action/LoadAction.java | 70 +-
.../client/gui/action/MapControlsAction.java | 36 +-
.../freecol/client/gui/action/MapEditorAction.java | 24 +-
.../freecol/client/gui/action/MapboardAction.java | 37 +-
.../gui/action/MiniMapToggleFogOfWarAction.java | 75 +
.../client/gui/action/MiniMapToggleViewAction.java | 74 +
.../client/gui/action/MiniMapZoomInAction.java | 49 +-
.../client/gui/action/MiniMapZoomOutAction.java | 50 +-
.../sf/freecol/client/gui/action/MoveAction.java | 49 +-
.../sf/freecol/client/gui/action/NewAction.java | 24 +-
.../client/gui/action/NewEmptyMapAction.java | 56 +-
.../sf/freecol/client/gui/action/OpenAction.java | 27 +-
.../client/gui/action/PreferencesAction.java | 24 +-
.../sf/freecol/client/gui/action/QuitAction.java | 22 +-
.../freecol/client/gui/action/ReconnectAction.java | 29 +-
.../sf/freecol/client/gui/action/RenameAction.java | 29 +-
.../client/gui/action/ReportCargoAction.java | 23 +-
.../client/gui/action/ReportColonyAction.java | 25 +-
.../action/ReportContinentalCongressAction.java | 25 +-
.../client/gui/action/ReportEducationAction.java | 25 +-
.../client/gui/action/ReportExplorationAction.java | 22 +-
.../client/gui/action/ReportForeignAction.java | 25 +-
.../client/gui/action/ReportHighScoresAction.java | 22 +-
.../client/gui/action/ReportHistoryAction.java | 23 +-
.../client/gui/action/ReportIndianAction.java | 25 +-
.../client/gui/action/ReportLabourAction.java | 31 +-
.../client/gui/action/ReportMilitaryAction.java | 25 +-
.../client/gui/action/ReportNavalAction.java | 25 +-
.../client/gui/action/ReportProductionAction.java | 23 +-
.../client/gui/action/ReportReligionAction.java | 25 +-
.../gui/action/ReportRequirementsAction.java | 25 +-
.../client/gui/action/ReportTradeAction.java | 25 +-
.../client/gui/action/ReportTurnAction.java | 29 +-
.../sf/freecol/client/gui/action/RetireAction.java | 36 +-
.../sf/freecol/client/gui/action/SaveAction.java | 44 +-
.../client/gui/action/SaveAndQuitAction.java | 25 +-
.../freecol/client/gui/action/ScaleMapAction.java | 90 +-
.../client/gui/action/SelectableAction.java | 105 +-
.../sf/freecol/client/gui/action/SentryAction.java | 28 +-
.../client/gui/action/ShowDifficultyAction.java | 24 +-
.../client/gui/action/ShowGameOptionsAction.java | 24 +-
.../freecol/client/gui/action/ShowMainAction.java | 40 +-
.../gui/action/ShowMapGeneratorOptionsAction.java | 26 +-
.../freecol/client/gui/action/SkipUnitAction.java | 29 +-
.../freecol/client/gui/action/TilePopupAction.java | 24 +-
.../client/gui/action/ToggleViewModeAction.java | 28 +-
.../client/gui/action/TradeRouteAction.java | 22 +-
.../sf/freecol/client/gui/action/UnitAction.java | 31 +-
.../sf/freecol/client/gui/action/UnloadAction.java | 54 +-
.../sf/freecol/client/gui/action/WaitAction.java | 28 +-
.../sf/freecol/client/gui/action/ZoomInAction.java | 44 +-
.../freecol/client/gui/action/ZoomOutAction.java | 45 +-
.../freecol/client/gui/animation/Animations.java | 33 +-
.../client/gui/animation/UnitAttackAnimation.java | 94 +-
.../client/gui/animation/UnitImageAnimation.java | 38 +-
.../client/gui/animation/UnitMoveAnimation.java | 113 +-
.../freecol/client/gui/i18n/DefaultNumberRule.java | 87 -
.../sf/freecol/client/gui/i18n/DualNumberRule.java | 42 -
src/net/sf/freecol/client/gui/i18n/Messages.java | 829 ---
src/net/sf/freecol/client/gui/i18n/Number.java | 68 -
.../sf/freecol/client/gui/i18n/NumberRules.java | 200 -
.../freecol/client/gui/i18n/OtherNumberRule.java | 32 -
.../freecol/client/gui/i18n/PluralNumberRule.java | 36 -
src/net/sf/freecol/client/gui/i18n/Relation.java | 143 -
src/net/sf/freecol/client/gui/i18n/Rule.java | 121 -
src/net/sf/freecol/client/gui/i18n/Selector.java | 35 -
.../sf/freecol/client/gui/i18n/TurnSelector.java | 89 -
.../freecol/client/gui/i18n/ZeroOneNumberRule.java | 36 -
src/net/sf/freecol/client/gui/i18n/package.html | 98 -
src/net/sf/freecol/client/gui/menu/DebugMenu.java | 381 +-
.../sf/freecol/client/gui/menu/FreeColMenuBar.java | 91 +-
.../freecol/client/gui/menu/FreeColMenuTest.java | 40 +-
.../sf/freecol/client/gui/menu/InGameMenuBar.java | 89 +-
.../freecol/client/gui/menu/MapEditorMenuBar.java | 79 +-
.../client/gui/menu/MenuMouseMotionListener.java | 80 +-
.../client/gui/option/AbstractUnitOptionUI.java | 212 +-
.../client/gui/option/AudioMixerOptionUI.java | 100 +-
.../freecol/client/gui/option/BooleanOptionUI.java | 32 +-
.../sf/freecol/client/gui/option/FileOptionUI.java | 84 +-
.../freecol/client/gui/option/FreeColActionUI.java | 146 +-
.../freecol/client/gui/option/IntegerOptionUI.java | 25 +-
.../client/gui/option/LanguageOptionUI.java | 42 +-
.../sf/freecol/client/gui/option/ListOptionUI.java | 197 +-
.../sf/freecol/client/gui/option/ModOptionUI.java | 138 +-
.../freecol/client/gui/option/OptionGroupUI.java | 127 +-
src/net/sf/freecol/client/gui/option/OptionUI.java | 162 +-
.../freecol/client/gui/option/OptionUpdater.java | 4 +-
.../client/gui/option/PercentageOptionUI.java | 32 +-
.../freecol/client/gui/option/RangeOptionUI.java | 27 +-
.../freecol/client/gui/option/SelectOptionUI.java | 53 +-
.../freecol/client/gui/option/SliderOptionUI.java | 37 +-
.../freecol/client/gui/option/StringOptionUI.java | 53 +-
.../sf/freecol/client/gui/option/TextOptionUI.java | 77 +
.../client/gui/option/UnitTypeOptionUI.java | 59 +-
src/net/sf/freecol/client/gui/package.html | 7 +-
.../sf/freecol/client/gui/panel/AboutPanel.java | 167 +-
.../client/gui/panel/AbstractGoodsLabel.java | 90 +-
.../client/gui/panel/AdvantageCellEditor.java | 66 -
.../client/gui/panel/AdvantageCellRenderer.java | 93 -
.../freecol/client/gui/panel/BuildQueuePanel.java | 1507 ++---
.../client/gui/panel/BuildingDetailPanel.java | 158 +-
.../sf/freecol/client/gui/panel/BuildingPanel.java | 207 +-
.../freecol/client/gui/panel/BuildingToolTip.java | 147 +-
.../client/gui/panel/CaptureGoodsDialog.java | 270 +-
.../sf/freecol/client/gui/panel/CargoPanel.java | 312 +-
src/net/sf/freecol/client/gui/panel/ChatPanel.java | 73 +-
.../sf/freecol/client/gui/panel/ChoiceDialog.java | 151 -
.../sf/freecol/client/gui/panel/ChoiceItem.java | 124 -
.../gui/panel/ChooseFoundingFatherDialog.java | 90 +-
.../client/gui/panel/ClassicMapControls.java | 69 +-
.../client/gui/panel/ClientOptionsDialog.java | 67 +-
.../sf/freecol/client/gui/panel/ColonyPanel.java | 2378 ++++---
.../client/gui/panel/ColopediaDetailPanel.java | 6 +-
.../gui/panel/ColopediaGameObjectTypePanel.java | 220 +-
.../freecol/client/gui/panel/ColopediaPanel.java | 149 +-
.../gui/panel/ColopediaTreeCellRenderer.java | 28 +-
.../client/gui/panel/ColopediaTreeItem.java | 27 +-
.../freecol/client/gui/panel/ColorCellEditor.java | 122 +
.../client/gui/panel/ColorCellRenderer.java | 42 +-
.../client/gui/panel/ColorChooserPanel.java | 86 +
.../client/gui/panel/CompactLabourReport.java | 269 +-
.../client/gui/panel/ConceptDetailPanel.java | 81 +-
.../client/gui/panel/ConfirmDeclarationDialog.java | 440 +-
.../client/gui/panel/ConstructionPanel.java | 175 +-
.../client/gui/panel/CornerMapControls.java | 172 +-
.../client/gui/panel/DeclarationDialog.java | 292 -
.../freecol/client/gui/panel/DeclarationPanel.java | 301 +
.../client/gui/panel/DefaultTransferHandler.java | 642 +-
.../freecol/client/gui/panel/DifficultyDialog.java | 227 +-
.../sf/freecol/client/gui/panel/DragListener.java | 126 +-
src/net/sf/freecol/client/gui/panel/Draggable.java | 11 +-
.../sf/freecol/client/gui/panel/DropListener.java | 24 +-
.../sf/freecol/client/gui/panel/DropTarget.java | 25 +-
.../freecol/client/gui/panel/DumpCargoDialog.java | 93 +-
.../freecol/client/gui/panel/EditOptionDialog.java | 75 +-
.../client/gui/panel/EditSettlementDialog.java | 273 +-
.../freecol/client/gui/panel/EmigrationDialog.java | 85 +
.../freecol/client/gui/panel/EmigrationPanel.java | 119 -
.../sf/freecol/client/gui/panel/EndTurnDialog.java | 283 +-
.../sf/freecol/client/gui/panel/ErrorPanel.java | 75 +-
.../sf/freecol/client/gui/panel/EuropePanel.java | 1198 ++--
.../sf/freecol/client/gui/panel/EventPanel.java | 67 +-
.../client/gui/panel/FatherDetailPanel.java | 136 +-
src/net/sf/freecol/client/gui/panel/FileList.java | 130 -
.../client/gui/panel/FindSettlementDialog.java | 185 -
.../client/gui/panel/FindSettlementPanel.java | 258 +
.../client/gui/panel/FirstContactDialog.java | 119 +
src/net/sf/freecol/client/gui/panel/Flag.java | 1230 ++++
.../client/gui/panel/FreeColChoiceDialog.java | 85 +
.../client/gui/panel/FreeColConfirmDialog.java | 87 +
.../sf/freecol/client/gui/panel/FreeColDialog.java | 827 +--
.../client/gui/panel/FreeColImageBorder.java | 230 +-
.../client/gui/panel/FreeColInputDialog.java | 115 +
.../sf/freecol/client/gui/panel/FreeColPanel.java | 686 +-
.../client/gui/panel/FreeColProgressBar.java | 46 +-
.../client/gui/panel/FreeColStringInputDialog.java | 90 +
.../client/gui/panel/GameOptionsDialog.java | 61 +-
.../freecol/client/gui/panel/GoodsDetailPanel.java | 139 +-
.../sf/freecol/client/gui/panel/GoodsLabel.java | 131 +-
.../freecol/client/gui/panel/ImageSelection.java | 58 +-
.../sf/freecol/client/gui/panel/InPortPanel.java | 39 +-
.../client/gui/panel/IndianSettlementPanel.java | 149 +-
src/net/sf/freecol/client/gui/panel/InfoPanel.java | 700 +-
.../client/gui/panel/InformationDialog.java | 120 -
.../freecol/client/gui/panel/InformationPanel.java | 141 +
.../sf/freecol/client/gui/panel/LabourData.java | 125 +-
.../sf/freecol/client/gui/panel/LoadDialog.java | 91 +
.../client/gui/panel/LoadingSavegameDialog.java | 156 +-
src/net/sf/freecol/client/gui/panel/MainPanel.java | 62 +-
.../sf/freecol/client/gui/panel/MapControls.java | 121 +-
.../client/gui/panel/MapEditorTransformPanel.java | 255 +-
.../gui/panel/MapGeneratorOptionsDialog.java | 220 +-
.../sf/freecol/client/gui/panel/MapSizeDialog.java | 100 +
.../sf/freecol/client/gui/panel/MarketLabel.java | 111 +-
src/net/sf/freecol/client/gui/panel/MigPanel.java | 69 +
src/net/sf/freecol/client/gui/panel/MiniMap.java | 164 +-
.../freecol/client/gui/panel/ModifierFormat.java | 135 +
.../sf/freecol/client/gui/panel/MonarchDialog.java | 112 +
.../sf/freecol/client/gui/panel/MonarchPanel.java | 123 -
.../freecol/client/gui/panel/NationCellEditor.java | 46 -
.../client/gui/panel/NationCellRenderer.java | 117 -
.../client/gui/panel/NationDetailPanel.java | 60 +-
.../client/gui/panel/NationTypeDetailPanel.java | 113 +-
.../client/gui/panel/NegotiationDialog.java | 1675 +++--
src/net/sf/freecol/client/gui/panel/NewPanel.java | 650 +-
.../sf/freecol/client/gui/panel/NewUnitPanel.java | 169 +
.../sf/freecol/client/gui/panel/OptionsDialog.java | 341 +-
.../sf/freecol/client/gui/panel/Parameters.java | 29 +-
.../freecol/client/gui/panel/ParametersDialog.java | 182 +-
.../sf/freecol/client/gui/panel/PlayersTable.java | 685 +-
src/net/sf/freecol/client/gui/panel/PortPanel.java | 103 +-
.../freecol/client/gui/panel/PreCombatDialog.java | 226 +-
.../freecol/client/gui/panel/ProductionLabel.java | 509 +-
.../sf/freecol/client/gui/panel/PurchasePanel.java | 44 +
.../freecol/client/gui/panel/QuickActionMenu.java | 896 ++-
.../sf/freecol/client/gui/panel/RebelToolTip.java | 99 +-
.../sf/freecol/client/gui/panel/RecruitDialog.java | 160 -
.../sf/freecol/client/gui/panel/RecruitPanel.java | 158 +
.../freecol/client/gui/panel/ReportCargoPanel.java | 37 +-
.../client/gui/panel/ReportClassicColonyPanel.java | 171 +
.../client/gui/panel/ReportColonyPanel.java | 930 ---
.../client/gui/panel/ReportCompactColonyPanel.java | 1136 ++++
.../gui/panel/ReportContinentalCongressPanel.java | 102 +-
.../client/gui/panel/ReportEducationPanel.java | 35 +-
.../client/gui/panel/ReportExplorationPanel.java | 62 +-
.../client/gui/panel/ReportForeignAffairPanel.java | 126 +-
.../client/gui/panel/ReportHighScoresPanel.java | 144 +-
.../client/gui/panel/ReportHistoryPanel.java | 24 +-
.../client/gui/panel/ReportIndianPanel.java | 235 +-
.../client/gui/panel/ReportLabourDetailPanel.java | 58 +-
.../client/gui/panel/ReportLabourPanel.java | 231 +-
.../client/gui/panel/ReportMilitaryPanel.java | 169 +-
.../freecol/client/gui/panel/ReportNavalPanel.java | 104 +-
.../sf/freecol/client/gui/panel/ReportPanel.java | 149 +-
.../client/gui/panel/ReportProductionPanel.java | 122 +-
.../client/gui/panel/ReportReligiousPanel.java | 64 +-
.../client/gui/panel/ReportRequirementsPanel.java | 270 +-
.../freecol/client/gui/panel/ReportTradePanel.java | 201 +-
.../freecol/client/gui/panel/ReportTurnPanel.java | 376 +-
.../freecol/client/gui/panel/ReportUnitPanel.java | 147 +-
.../client/gui/panel/ResourcesDetailPanel.java | 77 +-
.../freecol/client/gui/panel/RiverStyleDialog.java | 74 +
.../freecol/client/gui/panel/RiverStylePanel.java | 101 -
.../sf/freecol/client/gui/panel/SaveDialog.java | 92 +
.../client/gui/panel/ScaleMapSizeDialog.java | 173 +-
.../client/gui/panel/SelectAmountDialog.java | 120 +-
.../client/gui/panel/SelectDestinationDialog.java | 786 ++-
.../gui/panel/SelectTributeAmountDialog.java | 100 +
.../freecol/client/gui/panel/ServerListPanel.java | 92 +-
.../freecol/client/gui/panel/StartGamePanel.java | 202 +-
.../freecol/client/gui/panel/StatisticsPanel.java | 154 +-
.../sf/freecol/client/gui/panel/StatusPanel.java | 10 +-
.../client/gui/panel/TerrainDetailPanel.java | 129 +-
src/net/sf/freecol/client/gui/panel/TilePanel.java | 203 +-
.../freecol/client/gui/panel/TradeRouteDialog.java | 251 -
.../client/gui/panel/TradeRouteInputDialog.java | 684 --
.../client/gui/panel/TradeRouteInputPanel.java | 812 +++
.../freecol/client/gui/panel/TradeRoutePanel.java | 355 +
.../sf/freecol/client/gui/panel/TrainDialog.java | 152 -
.../sf/freecol/client/gui/panel/TrainPanel.java | 44 +
.../sf/freecol/client/gui/panel/UnitButton.java | 94 +-
.../freecol/client/gui/panel/UnitDetailPanel.java | 135 +-
src/net/sf/freecol/client/gui/panel/UnitLabel.java | 332 +-
src/net/sf/freecol/client/gui/panel/UnitPanel.java | 152 +-
src/net/sf/freecol/client/gui/panel/Utility.java | 637 ++
.../sf/freecol/client/gui/panel/VictoryDialog.java | 60 +
.../sf/freecol/client/gui/panel/VictoryPanel.java | 104 -
.../freecol/client/gui/panel/WarehouseDialog.java | 152 +-
.../client/gui/panel/WorkProductionPanel.java | 175 +-
.../client/gui/plaf/FreeColBrightPanelUI.java | 12 +-
.../freecol/client/gui/plaf/FreeColButtonUI.java | 11 +-
.../freecol/client/gui/plaf/FreeColCheckBoxUI.java | 9 +-
.../client/gui/plaf/FreeColComboBoxRenderer.java | 125 +-
.../freecol/client/gui/plaf/FreeColComboBoxUI.java | 10 +-
.../client/gui/plaf/FreeColFileChooserUI.java | 6 +-
.../sf/freecol/client/gui/plaf/FreeColLabelUI.java | 10 +-
.../sf/freecol/client/gui/plaf/FreeColListUI.java | 16 +-
.../client/gui/plaf/FreeColLookAndFeel.java | 103 +-
.../freecol/client/gui/plaf/FreeColMenuBarUI.java | 12 +-
.../freecol/client/gui/plaf/FreeColMenuItemUI.java | 6 +-
.../client/gui/plaf/FreeColOptionPaneUI.java | 207 +-
.../sf/freecol/client/gui/plaf/FreeColPanelUI.java | 12 +-
.../client/gui/plaf/FreeColPopupMenuUI.java | 12 +-
.../client/gui/plaf/FreeColRadioButtonUI.java | 9 +-
.../client/gui/plaf/FreeColScrollPaneUI.java | 5 +-
.../client/gui/plaf/FreeColSelectedPanelUI.java | 7 +-
.../client/gui/plaf/FreeColTableHeaderUI.java | 5 +-
.../sf/freecol/client/gui/plaf/FreeColTableUI.java | 5 +-
.../freecol/client/gui/plaf/FreeColTextAreaUI.java | 9 +-
.../client/gui/plaf/FreeColTextFieldUI.java | 9 +-
.../freecol/client/gui/plaf/FreeColToolTipUI.java | 46 +-
.../client/gui/plaf/FreeColTransparentPanelUI.java | 18 +-
.../sf/freecol/client/gui/plaf/LAFUtilities.java | 8 +-
.../client/gui/sound/OggVorbisDecoderFactory.java | 443 --
src/net/sf/freecol/client/gui/sound/Playlist.java | 264 -
.../sf/freecol/client/gui/sound/SoundPlayer.java | 335 -
src/net/sf/freecol/client/gui/sound/package.html | 21 -
.../freecol/client/gui/video/VideoComponent.java | 115 +-
.../sf/freecol/client/gui/video/VideoListener.java | 2 +-
.../freecol/client/networking/UserServerAPI.java | 36 +-
src/net/sf/freecol/client/package.html | 2 +-
src/net/sf/freecol/common/FreeColException.java | 25 +-
src/net/sf/freecol/common/FreeColSeed.java | 58 +-
src/net/sf/freecol/common/ObjectWithId.java | 35 +
src/net/sf/freecol/common/ServerInfo.java | 188 +-
src/net/sf/freecol/common/debug/DebugUtils.java | 945 +--
.../sf/freecol/common/debug/FreeColDebugger.java | 187 +-
.../sf/freecol/common/i18n/DefaultNumberRule.java | 84 +
src/net/sf/freecol/common/i18n/DualNumberRule.java | 43 +
src/net/sf/freecol/common/i18n/Messages.java | 958 +++
src/net/sf/freecol/common/i18n/NameCache.java | 556 ++
src/net/sf/freecol/common/i18n/Number.java | 70 +
src/net/sf/freecol/common/i18n/NumberRules.java | 193 +
.../sf/freecol/common/i18n/OtherNumberRule.java | 34 +
.../sf/freecol/common/i18n/PluralNumberRule.java | 38 +
src/net/sf/freecol/common/i18n/Relation.java | 141 +
src/net/sf/freecol/common/i18n/Rule.java | 118 +
src/net/sf/freecol/common/i18n/Selector.java | 35 +
.../sf/freecol/common/i18n/ZeroOneNumberRule.java | 38 +
src/net/sf/freecol/common/i18n/package.html | 98 +
src/net/sf/freecol/common/io/FreeColDataFile.java | 236 +-
.../sf/freecol/common/io/FreeColDirectories.java | 942 ++-
src/net/sf/freecol/common/io/FreeColModFile.java | 119 +-
.../sf/freecol/common/io/FreeColSavegameFile.java | 73 +-
src/net/sf/freecol/common/io/FreeColTcFile.java | 25 +-
src/net/sf/freecol/common/io/FreeColXMLReader.java | 864 +++
src/net/sf/freecol/common/io/FreeColXMLWriter.java | 547 ++
src/net/sf/freecol/common/io/Mods.java | 71 +-
.../sf/freecol/common/io/sza/AnimationEvent.java | 19 +
.../freecol/common/io/sza/ImageAnimationEvent.java | 19 +
.../common/io/sza/SimpleZippedAnimation.java | 63 +-
.../sf/freecol/common/logging/DefaultHandler.java | 69 +-
.../sf/freecol/common/logging/TextFormatter.java | 16 +-
src/net/sf/freecol/common/model/Ability.java | 446 +-
src/net/sf/freecol/common/model/AbstractGoods.java | 237 +-
src/net/sf/freecol/common/model/AbstractUnit.java | 252 +-
src/net/sf/freecol/common/model/BuildQueue.java | 109 +-
src/net/sf/freecol/common/model/BuildableType.java | 225 +-
src/net/sf/freecol/common/model/Building.java | 817 ++-
src/net/sf/freecol/common/model/BuildingType.java | 413 +-
src/net/sf/freecol/common/model/Colony.java | 3987 ++++++------
src/net/sf/freecol/common/model/ColonyTile.java | 604 +-
.../sf/freecol/common/model/ColonyTradeItem.java | 190 +-
src/net/sf/freecol/common/model/ColonyWas.java | 23 +-
src/net/sf/freecol/common/model/CombatModel.java | 73 +-
src/net/sf/freecol/common/model/Consumer.java | 24 +-
.../sf/freecol/common/model/DiplomaticTrade.java | 408 +-
src/net/sf/freecol/common/model/Direction.java | 253 +
src/net/sf/freecol/common/model/Disaster.java | 221 +-
src/net/sf/freecol/common/model/Effect.java | 231 +-
src/net/sf/freecol/common/model/EquipmentType.java | 167 +-
src/net/sf/freecol/common/model/Europe.java | 730 ++-
src/net/sf/freecol/common/model/EuropeWas.java | 16 +-
.../freecol/common/model/EuropeanNationType.java | 170 +-
src/net/sf/freecol/common/model/Event.java | 207 +-
src/net/sf/freecol/common/model/ExportData.java | 177 +-
src/net/sf/freecol/common/model/Feature.java | 271 +-
.../sf/freecol/common/model/FeatureContainer.java | 554 +-
.../sf/freecol/common/model/FoundingFather.java | 444 +-
.../sf/freecol/common/model/FreeColGameObject.java | 606 +-
.../common/model/FreeColGameObjectListener.java | 29 +-
.../common/model/FreeColGameObjectType.java | 255 +-
src/net/sf/freecol/common/model/FreeColObject.java | 1848 +++---
src/net/sf/freecol/common/model/Game.java | 1697 ++---
src/net/sf/freecol/common/model/GameOptions.java | 498 +-
src/net/sf/freecol/common/model/GoldTradeItem.java | 158 +-
src/net/sf/freecol/common/model/Goods.java | 258 +-
.../sf/freecol/common/model/GoodsContainer.java | 681 +-
src/net/sf/freecol/common/model/GoodsLocation.java | 206 +-
.../sf/freecol/common/model/GoodsTradeItem.java | 231 +-
src/net/sf/freecol/common/model/GoodsType.java | 706 +-
src/net/sf/freecol/common/model/HighScore.java | 616 +-
src/net/sf/freecol/common/model/HighSeas.java | 188 +-
src/net/sf/freecol/common/model/HistoryEvent.java | 333 +-
.../sf/freecol/common/model/InciteTradeItem.java | 199 +
.../sf/freecol/common/model/IndianNationType.java | 164 +-
.../sf/freecol/common/model/IndianSettlement.java | 1254 ++--
src/net/sf/freecol/common/model/LandMap.java | 451 ++
src/net/sf/freecol/common/model/LastSale.java | 118 +-
src/net/sf/freecol/common/model/Limit.java | 153 +-
src/net/sf/freecol/common/model/Locatable.java | 31 +-
src/net/sf/freecol/common/model/Location.java | 92 +-
.../sf/freecol/common/model/LostCityRumour.java | 473 +-
src/net/sf/freecol/common/model/Map.java | 1922 +++---
src/net/sf/freecol/common/model/Market.java | 313 +-
src/net/sf/freecol/common/model/MarketData.java | 442 +-
src/net/sf/freecol/common/model/MarketWas.java | 94 +
.../sf/freecol/common/model/ModelController.java | 39 -
src/net/sf/freecol/common/model/ModelMessage.java | 553 +-
src/net/sf/freecol/common/model/Modifier.java | 631 +-
src/net/sf/freecol/common/model/Monarch.java | 1269 ++--
src/net/sf/freecol/common/model/Movable.java | 5 +-
src/net/sf/freecol/common/model/Nameable.java | 17 +-
src/net/sf/freecol/common/model/Named.java | 13 +-
src/net/sf/freecol/common/model/Nation.java | 328 +-
src/net/sf/freecol/common/model/NationOptions.java | 338 +-
src/net/sf/freecol/common/model/NationSummary.java | 245 +-
src/net/sf/freecol/common/model/NationType.java | 177 +-
src/net/sf/freecol/common/model/Occupation.java | 188 +
src/net/sf/freecol/common/model/Operand.java | 252 +-
src/net/sf/freecol/common/model/Ownable.java | 9 +-
src/net/sf/freecol/common/model/PathNode.java | 117 +-
src/net/sf/freecol/common/model/Player.java | 5617 ++++++++--------
.../freecol/common/model/PlayerExploredTile.java | 459 +-
.../sf/freecol/common/model/ProductionCache.java | 120 +-
.../sf/freecol/common/model/ProductionInfo.java | 193 +-
src/net/sf/freecol/common/model/ProductionMap.java | 93 +-
.../sf/freecol/common/model/ProductionType.java | 552 ++
src/net/sf/freecol/common/model/RandomRange.java | 278 +-
src/net/sf/freecol/common/model/Region.java | 642 +-
src/net/sf/freecol/common/model/Resource.java | 309 +-
src/net/sf/freecol/common/model/ResourceType.java | 114 +-
src/net/sf/freecol/common/model/Role.java | 394 +-
src/net/sf/freecol/common/model/Scope.java | 333 +-
src/net/sf/freecol/common/model/Settlement.java | 785 ++-
.../sf/freecol/common/model/SettlementType.java | 487 +-
.../sf/freecol/common/model/SimpleCombatModel.java | 766 ++-
src/net/sf/freecol/common/model/Specification.java | 2983 ++++++---
src/net/sf/freecol/common/model/Stance.java | 181 +
.../sf/freecol/common/model/StanceTradeItem.java | 175 +-
.../sf/freecol/common/model/StringTemplate.java | 712 +-
src/net/sf/freecol/common/model/Tension.java | 71 +-
src/net/sf/freecol/common/model/Tile.java | 3336 ++++++----
.../sf/freecol/common/model/TileImprovement.java | 693 +-
.../freecol/common/model/TileImprovementStyle.java | 185 +-
.../freecol/common/model/TileImprovementType.java | 641 +-
src/net/sf/freecol/common/model/TileItem.java | 176 +-
.../sf/freecol/common/model/TileItemContainer.java | 810 +--
src/net/sf/freecol/common/model/TileType.java | 854 +--
.../sf/freecol/common/model/TileTypeChange.java | 182 +-
src/net/sf/freecol/common/model/TradeItem.java | 198 +-
src/net/sf/freecol/common/model/TradeLocation.java | 57 +
src/net/sf/freecol/common/model/TradeRoute.java | 524 +-
.../sf/freecol/common/model/TradeRouteStop.java | 359 +-
.../freecol/common/model/TransactionListener.java | 7 +-
src/net/sf/freecol/common/model/Turn.java | 260 +-
src/net/sf/freecol/common/model/TypeCountMap.java | 28 +-
src/net/sf/freecol/common/model/Unit.java | 5820 +++++++++--------
src/net/sf/freecol/common/model/UnitLocation.java | 364 +-
src/net/sf/freecol/common/model/UnitTradeItem.java | 161 +-
src/net/sf/freecol/common/model/UnitType.java | 650 +-
.../sf/freecol/common/model/UnitTypeChange.java | 200 +-
src/net/sf/freecol/common/model/UnitWas.java | 274 +-
src/net/sf/freecol/common/model/WorkLocation.java | 847 ++-
.../common/model/mission/AbstractMission.java | 68 +-
.../common/model/mission/CompoundMission.java | 82 +-
.../freecol/common/model/mission/GoToMission.java | 63 +-
.../common/model/mission/ImprovementMission.java | 66 +-
.../sf/freecol/common/model/mission/Mission.java | 11 +-
.../common/model/mission/MissionManager.java | 40 +-
.../common/model/pathfinding/BaseCostDecider.java | 18 +-
.../common/model/pathfinding/CostDecider.java | 2 +-
.../common/model/pathfinding/CostDeciders.java | 123 +-
.../common/model/pathfinding/GoalDecider.java | 34 +-
.../common/model/pathfinding/GoalDeciders.java | 357 +-
.../common/networking/AbandonColonyMessage.java | 20 +-
.../freecol/common/networking/AskSkillMessage.java | 29 +-
.../common/networking/AssignTeacherMessage.java | 30 +-
.../common/networking/AssignTradeRouteMessage.java | 27 +-
.../freecol/common/networking/AttackMessage.java | 27 +-
.../common/networking/BuildColonyMessage.java | 32 +-
.../freecol/common/networking/BuyGoodsMessage.java | 148 -
.../sf/freecol/common/networking/BuyMessage.java | 79 +-
.../common/networking/BuyPropositionMessage.java | 56 +-
.../networking/CashInTreasureTrainMessage.java | 20 +-
.../common/networking/ChangeStateMessage.java | 28 +-
.../ChangeWorkImprovementTypeMessage.java | 32 +-
.../common/networking/ChangeWorkTypeMessage.java | 27 +-
.../sf/freecol/common/networking/ChatMessage.java | 32 +-
.../networking/ChooseFoundingFatherMessage.java | 98 +-
.../common/networking/ClaimLandMessage.java | 75 +-
.../common/networking/ClearSpecialityMessage.java | 19 +-
src/net/sf/freecol/common/networking/Client.java | 104 +-
.../common/networking/CloseTransactionMessage.java | 25 +-
.../sf/freecol/common/networking/Connection.java | 398 +-
.../CurrentPlayerNetworkRequestHandler.java | 88 +
.../sf/freecol/common/networking/DOMMessage.java | 94 +-
.../networking/DeclareIndependenceMessage.java | 50 +-
.../common/networking/DeclineMoundsMessage.java | 27 +-
.../common/networking/DeliverGiftMessage.java | 58 +-
.../common/networking/DemandTributeMessage.java | 47 +-
.../common/networking/DiplomacyMessage.java | 293 +-
.../common/networking/DisbandUnitMessage.java | 21 +-
.../common/networking/DisembarkMessage.java | 23 +-
.../freecol/common/networking/EmbarkMessage.java | 45 +-
.../common/networking/EmigrateUnitMessage.java | 52 +-
.../common/networking/EquipForRoleMessage.java | 148 +
.../common/networking/EquipUnitMessage.java | 160 -
.../common/networking/FirstContactMessage.java | 189 +
.../common/networking/GetNationSummaryMessage.java | 32 +-
.../common/networking/GetTransactionMessage.java | 24 +-
.../common/networking/GoodsForSaleMessage.java | 43 +-
.../freecol/common/networking/InciteMessage.java | 53 +-
.../common/networking/IndianDemandMessage.java | 120 +-
.../common/networking/JoinColonyMessage.java | 30 +-
.../common/networking/LearnSkillMessage.java | 35 +-
.../common/networking/LoadCargoMessage.java | 119 -
.../common/networking/LoadGoodsMessage.java | 161 +
.../sf/freecol/common/networking/LoginMessage.java | 45 +-
.../common/networking/LootCargoMessage.java | 56 +-
src/net/sf/freecol/common/networking/Message.java | 22 +-
.../freecol/common/networking/MessageHandler.java | 2 +-
.../common/networking/MissionaryMessage.java | 51 +-
.../common/networking/MonarchActionMessage.java | 67 +-
.../sf/freecol/common/networking/MoveMessage.java | 31 +-
.../freecol/common/networking/MoveToMessage.java | 29 +-
.../common/networking/NetworkConstants.java | 6 +-
.../common/networking/NetworkReplyObject.java | 10 +-
.../common/networking/NetworkRequestHandler.java | 39 +
.../common/networking/NewLandNameMessage.java | 144 +-
.../common/networking/NewRegionNameMessage.java | 69 +-
.../networking/NoRouteToServerException.java | 33 -
.../common/networking/PayArrearsMessage.java | 17 +-
.../common/networking/PayForBuildingMessage.java | 19 +-
.../common/networking/PutOutsideColonyMessage.java | 21 +-
.../common/networking/RearrangeColonyMessage.java | 284 +
.../freecol/common/networking/ReceivingThread.java | 259 +-
.../freecol/common/networking/RenameMessage.java | 25 +-
.../networking/ScoutIndianSettlementMessage.java | 33 +-
.../networking/ScoutSpeakToChiefMessage.java | 145 +
.../common/networking/SellGoodsMessage.java | 153 -
.../sf/freecol/common/networking/SellMessage.java | 74 +-
.../common/networking/SellPropositionMessage.java | 57 +-
.../sf/freecol/common/networking/ServerAPI.java | 932 ++-
.../common/networking/SetBuildQueueMessage.java | 41 +-
.../common/networking/SetCurrentStopMessage.java | 132 +
.../common/networking/SetDestinationMessage.java | 31 +-
.../common/networking/SetGoodsLevelsMessage.java | 30 +-
.../common/networking/SetTradeRoutesMessage.java | 39 +-
.../common/networking/SpySettlementMessage.java | 32 +-
.../networking/TrainUnitInEuropeMessage.java | 17 +-
.../freecol/common/networking/TrivialMessage.java | 51 +
.../common/networking/UnloadCargoMessage.java | 114 -
.../common/networking/UnloadGoodsMessage.java | 149 +
.../networking/UpdateCurrentStopMessage.java | 101 -
.../common/networking/UpdateTradeRouteMessage.java | 23 +-
.../sf/freecol/common/networking/WorkMessage.java | 38 +-
.../sf/freecol/common/option/AbstractOption.java | 189 +-
.../freecol/common/option/AbstractUnitOption.java | 308 +-
.../sf/freecol/common/option/AudioMixerOption.java | 278 +-
.../sf/freecol/common/option/BooleanOption.java | 101 +-
src/net/sf/freecol/common/option/FileOption.java | 93 +-
.../sf/freecol/common/option/IntegerOption.java | 214 +-
.../sf/freecol/common/option/LanguageOption.java | 432 +-
src/net/sf/freecol/common/option/ListOption.java | 305 +-
.../freecol/common/option/MapGeneratorOptions.java | 178 +-
.../sf/freecol/common/option/ModListOption.java | 48 +-
src/net/sf/freecol/common/option/ModOption.java | 186 +-
src/net/sf/freecol/common/option/Option.java | 57 +-
src/net/sf/freecol/common/option/OptionGroup.java | 560 +-
.../sf/freecol/common/option/PercentageOption.java | 40 +-
src/net/sf/freecol/common/option/RangeOption.java | 58 +-
src/net/sf/freecol/common/option/SelectOption.java | 210 +-
src/net/sf/freecol/common/option/StringOption.java | 222 +-
src/net/sf/freecol/common/option/TextOption.java | 150 +
.../sf/freecol/common/option/UnitListOption.java | 43 +-
.../sf/freecol/common/option/UnitTypeOption.java | 311 +-
.../sf/freecol/common/resources/AudioResource.java | 21 +-
.../sf/freecol/common/resources/ColorResource.java | 50 +-
src/net/sf/freecol/common/resources/FAFile.java | 41 +-
.../freecol/common/resources/FAFileResource.java | 14 +-
.../sf/freecol/common/resources/FontResource.java | 59 +-
.../sf/freecol/common/resources/ImageResource.java | 222 +-
src/net/sf/freecol/common/resources/Resource.java | 50 +-
.../freecol/common/resources/ResourceFactory.java | 207 +-
.../freecol/common/resources/ResourceManager.java | 655 +-
.../freecol/common/resources/ResourceMapper.java | 80 +
.../freecol/common/resources/ResourceMapping.java | 284 +-
.../sf/freecol/common/resources/SZAResource.java | 69 +-
.../freecol/common/resources/StringResource.java | 61 +
src/net/sf/freecol/common/resources/Video.java | 12 +-
.../sf/freecol/common/resources/VideoResource.java | 25 +-
.../common/sound/OggVorbisDecoderFactory.java | 459 ++
src/net/sf/freecol/common/sound/Playlist.java | 263 +
src/net/sf/freecol/common/sound/SoundPlayer.java | 323 +
src/net/sf/freecol/common/sound/package.html | 14 +
.../sf/freecol/common/util/CollectionUtils.java | 470 ++
src/net/sf/freecol/common/util/EmptyIterator.java | 59 -
src/net/sf/freecol/common/util/Introspector.java | 157 +-
src/net/sf/freecol/common/util/LogBuilder.java | 216 +
src/net/sf/freecol/common/util/RandomChoice.java | 52 +-
src/net/sf/freecol/common/util/RandomUtils.java | 148 +
.../freecol/common/util/ReplayableInputStream.java | 102 -
src/net/sf/freecol/common/util/StringUtils.java | 203 +
src/net/sf/freecol/common/util/Utils.java | 254 +-
src/net/sf/freecol/common/util/XMLStream.java | 103 -
src/net/sf/freecol/common/util/Xml.java | 45 +-
src/net/sf/freecol/metaserver/MetaItem.java | 62 +-
src/net/sf/freecol/metaserver/MetaRegister.java | 27 +-
src/net/sf/freecol/metaserver/MetaServer.java | 30 +-
src/net/sf/freecol/metaserver/NetworkHandler.java | 65 +-
src/net/sf/freecol/server/FreeColServer.java | 1549 ++---
src/net/sf/freecol/server/ai/AIColony.java | 1393 ++--
src/net/sf/freecol/server/ai/AIGoods.java | 513 +-
.../sf/freecol/server/ai/AIInGameInputHandler.java | 491 +-
src/net/sf/freecol/server/ai/AIMain.java | 619 +-
src/net/sf/freecol/server/ai/AIMessage.java | 258 +-
src/net/sf/freecol/server/ai/AIObject.java | 118 +-
src/net/sf/freecol/server/ai/AIPlayer.java | 525 +-
src/net/sf/freecol/server/ai/AIUnit.java | 890 +--
.../sf/freecol/server/ai/CacheEntryComparator.java | 6 +-
src/net/sf/freecol/server/ai/Cargo.java | 763 +++
src/net/sf/freecol/server/ai/ColonyPlan.java | 912 ++-
src/net/sf/freecol/server/ai/EuropeanAIPlayer.java | 2992 +++++----
src/net/sf/freecol/server/ai/GoodsWish.java | 127 +-
src/net/sf/freecol/server/ai/NativeAIPlayer.java | 829 ++-
src/net/sf/freecol/server/ai/ProductionCache.java | 60 +-
src/net/sf/freecol/server/ai/REFAIPlayer.java | 863 ++-
.../sf/freecol/server/ai/TileImprovementPlan.java | 200 +-
src/net/sf/freecol/server/ai/Transportable.java | 214 -
.../freecol/server/ai/TransportableAIObject.java | 404 ++
src/net/sf/freecol/server/ai/ValuedAIObject.java | 65 +-
src/net/sf/freecol/server/ai/Wish.java | 131 +-
src/net/sf/freecol/server/ai/WorkLocationPlan.java | 60 +-
src/net/sf/freecol/server/ai/WorkerWish.java | 94 +-
.../ai/goal/CreateMissionAtSettlementGoal.java | 77 +-
src/net/sf/freecol/server/ai/goal/Goal.java | 63 +-
.../sf/freecol/server/ai/goal/GoalConstants.java | 2 +-
.../freecol/server/ai/goal/GotoAdjacentGoal.java | 31 +-
.../server/ai/goal/ManageMissionariesGoal.java | 93 +-
.../server/ai/mission/BuildColonyMission.java | 404 +-
.../ai/mission/CashInTreasureTrainMission.java | 344 +-
.../server/ai/mission/DefendSettlementMission.java | 274 +-
.../server/ai/mission/IdleAtSettlementMission.java | 126 +-
.../server/ai/mission/IndianBringGiftMission.java | 295 +-
.../server/ai/mission/IndianDemandMission.java | 404 +-
src/net/sf/freecol/server/ai/mission/Mission.java | 905 +--
.../server/ai/mission/MissionaryMission.java | 282 +-
.../server/ai/mission/PioneeringMission.java | 461 +-
.../server/ai/mission/PrivateerMission.java | 302 +-
.../freecol/server/ai/mission/ScoutingMission.java | 315 +-
.../server/ai/mission/TransportMission.java | 1999 +++---
.../ai/mission/UnitSeekAndDestroyMission.java | 316 +-
.../ai/mission/UnitWanderHostileMission.java | 123 +-
.../server/ai/mission/UnitWanderMission.java | 57 +-
.../server/ai/mission/WishRealizationMission.java | 223 +-
.../server/ai/mission/WorkInsideColonyMission.java | 150 +-
src/net/sf/freecol/server/control/ChangeSet.java | 751 ++-
src/net/sf/freecol/server/control/Controller.java | 2 +-
.../server/control/FreeColServerHolder.java | 6 +-
.../freecol/server/control/InGameController.java | 3095 +++++----
.../freecol/server/control/InGameInputHandler.java | 354 +-
.../sf/freecol/server/control/InputHandler.java | 128 +-
.../freecol/server/control/PreGameController.java | 117 +-
.../server/control/PreGameInputHandler.java | 373 +-
.../server/control/UserConnectionHandler.java | 166 +-
.../server/generator/ColonizationMapLoader.java | 177 +
.../freecol/server/generator/FreeColMapLoader.java | 139 +
.../sf/freecol/server/generator/LandGenerator.java | 395 --
.../sf/freecol/server/generator/MapGenerator.java | 40 +-
.../server/generator/MapLayerGenerator.java | 2 +-
src/net/sf/freecol/server/generator/MapLoader.java | 2 +-
src/net/sf/freecol/server/generator/River.java | 289 +-
.../sf/freecol/server/generator/RiverSection.java | 51 +-
.../server/generator/SimpleMapGenerator.java | 982 ++-
.../freecol/server/generator/TerrainGenerator.java | 1327 ++--
src/net/sf/freecol/server/model/DemandSession.java | 97 -
.../sf/freecol/server/model/DiplomacySession.java | 40 +-
src/net/sf/freecol/server/model/LootSession.java | 15 +-
.../sf/freecol/server/model/MonarchSession.java | 129 +
.../sf/freecol/server/model/ServerBuilding.java | 204 +-
src/net/sf/freecol/server/model/ServerColony.java | 566 +-
.../sf/freecol/server/model/ServerColonyTile.java | 49 +-
src/net/sf/freecol/server/model/ServerEurope.java | 236 +-
src/net/sf/freecol/server/model/ServerGame.java | 452 +-
.../server/model/ServerIndianSettlement.java | 441 +-
.../sf/freecol/server/model/ServerModelObject.java | 16 +-
src/net/sf/freecol/server/model/ServerPlayer.java | 2995 +++++----
src/net/sf/freecol/server/model/ServerRegion.java | 496 +-
src/net/sf/freecol/server/model/ServerUnit.java | 881 +--
src/net/sf/freecol/server/model/TradeSession.java | 5 +-
.../freecol/server/model/TransactionSession.java | 14 +-
.../freecol/server/networking/DummyConnection.java | 107 +-
src/net/sf/freecol/server/networking/Server.java | 117 +-
.../sf/freecol/tools/ColonizationMapReader.java | 72 +-
.../freecol/tools/ColonizationSaveGameReader.java | 232 +
src/net/sf/freecol/tools/DesktopEntry.java | 125 +-
src/net/sf/freecol/tools/FSGConverter.java | 18 +-
src/net/sf/freecol/tools/FlagTest.java | 421 +-
src/net/sf/freecol/tools/ForestMaker.java | 325 +
.../sf/freecol/tools/GenerateDocumentation.java | 233 +
.../sf/freecol/tools/InstallerTranslations.java | 26 +-
src/net/sf/freecol/tools/MapConverter.java | 19 +-
src/net/sf/freecol/tools/MergeTranslations.java | 64 +-
src/net/sf/freecol/tools/RiverMaker.java | 182 +
src/net/sf/freecol/tools/SaveGameValidator.java | 25 +-
src/net/sf/freecol/tools/TranslationReport.java | 52 +-
test/src/net/sf/freecol/AllTests.java | 4 +-
test/src/net/sf/freecol/client/AllTests.java | 3 +-
.../net/sf/freecol/client/ClientTestHelper.java | 15 +-
test/src/net/sf/freecol/client/WorkerCheck.java | 58 +-
.../net/sf/freecol/client/control/AllTests.java | 3 +-
.../net/sf/freecol/client/control/MoveTest.java | 19 +-
test/src/net/sf/freecol/client/gui/AllTests.java | 5 +-
test/src/net/sf/freecol/client/gui/FontTest.java | 12 +-
.../net/sf/freecol/client/gui/i18n/AllTests.java | 37 -
.../net/sf/freecol/client/gui/i18n/CLDRTest.java | 114 -
test/src/net/sf/freecol/client/gui/i18n/Merge.java | 30 -
.../client/gui/i18n/MergeTableCellRenderer.java | 63 -
.../freecol/client/gui/i18n/MergeTableModel.java | 117 -
.../sf/freecol/client/gui/i18n/MessageMerge.java | 201 -
.../sf/freecol/client/gui/i18n/MessagesTest.java | 429 --
.../net/sf/freecol/client/gui/sound/SoundTest.java | 112 -
test/src/net/sf/freecol/common/AllTests.java | 4 +-
test/src/net/sf/freecol/common/i18n/AllTests.java | 36 +
test/src/net/sf/freecol/common/i18n/CLDRTest.java | 111 +
test/src/net/sf/freecol/common/i18n/Merge.java | 31 +
.../common/i18n/MergeTableCellRenderer.java | 62 +
.../sf/freecol/common/i18n/MergeTableModel.java | 118 +
.../net/sf/freecol/common/i18n/MessageMerge.java | 185 +
.../net/sf/freecol/common/i18n/MessagesTest.java | 657 ++
test/src/net/sf/freecol/common/io/AllTests.java | 5 +-
test/src/net/sf/freecol/common/io/ModTest.java | 9 +-
.../sf/freecol/common/model/AbstractUnitTest.java | 40 -
test/src/net/sf/freecol/common/model/AllTests.java | 81 +-
.../freecol/common/model/BaseCostDeciderTest.java | 23 +-
.../net/sf/freecol/common/model/BuildingTest.java | 609 +-
.../freecol/common/model/ColonyProductionTest.java | 220 +-
.../net/sf/freecol/common/model/ColonyTest.java | 239 +-
.../net/sf/freecol/common/model/CombatTest.java | 548 +-
.../net/sf/freecol/common/model/DisasterTest.java | 4 +-
.../net/sf/freecol/common/model/EuropeTest.java | 18 +-
.../freecol/common/model/FoundingFatherTest.java | 74 +-
test/src/net/sf/freecol/common/model/GameTest.java | 65 +-
.../freecol/common/model/GoodsContainerTest.java | 3 +-
.../src/net/sf/freecol/common/model/GoodsTest.java | 203 +-
.../net/sf/freecol/common/model/HighSeasTest.java | 8 +-
.../freecol/common/model/IndianSettlementTest.java | 51 +-
.../freecol/common/model/IndividualFatherTest.java | 401 +-
.../src/net/sf/freecol/common/model/LimitTest.java | 60 +-
test/src/net/sf/freecol/common/model/MapTest.java | 112 +-
.../net/sf/freecol/common/model/MarketTest.java | 30 +-
.../sf/freecol/common/model/ModelMessageTest.java | 49 +-
.../net/sf/freecol/common/model/ModifierTest.java | 211 +-
.../net/sf/freecol/common/model/MonarchTest.java | 34 +-
.../net/sf/freecol/common/model/MovementTest.java | 216 +-
.../sf/freecol/common/model/NationTypeTest.java | 38 +-
.../sf/freecol/common/model/PathfindingTest.java | 145 +
.../net/sf/freecol/common/model/PlayerTest.java | 152 +-
.../freecol/common/model/ProductionTypeTest.java | 873 +++
.../sf/freecol/common/model/RandomRangeTest.java | 51 +
test/src/net/sf/freecol/common/model/RoleTest.java | 169 +-
.../net/sf/freecol/common/model/SchoolTest.java | 62 +-
.../src/net/sf/freecol/common/model/ScopeTest.java | 21 +-
.../sf/freecol/common/model/SerializationTest.java | 94 +-
.../sf/freecol/common/model/SettlementTest.java | 96 +-
test/src/net/sf/freecol/common/model/SoLTest.java | 4 +-
.../sf/freecol/common/model/SpecificationTest.java | 471 +-
.../freecol/common/model/TileImprovementTest.java | 79 +-
.../common/model/TileItemContainerTest.java | 67 +-
test/src/net/sf/freecol/common/model/TileTest.java | 449 +-
.../sf/freecol/common/model/TradeRouteTest.java | 158 +
test/src/net/sf/freecol/common/model/UnitTest.java | 261 +-
.../freecol/common/model/UnitTypeChangeTest.java | 17 +-
.../src/net/sf/freecol/common/option/AllTests.java | 5 +-
.../net/sf/freecol/common/option/OptionTest.java | 19 +-
test/src/net/sf/freecol/common/sound/AllTests.java | 36 +
.../src/net/sf/freecol/common/sound/SoundTest.java | 116 +
test/src/net/sf/freecol/common/utils/AllTests.java | 2 +-
.../src/net/sf/freecol/common/utils/UtilsTest.java | 47 +-
test/src/net/sf/freecol/server/AllTests.java | 23 +-
test/src/net/sf/freecol/server/SaveLoadTest.java | 35 +-
.../net/sf/freecol/server/ServerTestHelper.java | 108 +-
.../src/net/sf/freecol/server/ai/AIColonyTest.java | 78 +-
test/src/net/sf/freecol/server/ai/AllTests.java | 5 +-
.../net/sf/freecol/server/ai/ColonyPlanTest.java | 30 +-
test/src/net/sf/freecol/server/ai/ContactTest.java | 194 +-
.../freecol/server/ai/MissionAssignmentTest.java | 82 +-
test/src/net/sf/freecol/server/ai/REFTest.java | 85 +-
.../sf/freecol/server/ai/StandardAIPlayerTest.java | 52 +-
test/src/net/sf/freecol/server/ai/TensionTest.java | 23 +-
.../net/sf/freecol/server/ai/mission/AllTests.java | 5 +-
.../server/ai/mission/PioneeringMissionTest.java | 102 +-
.../server/ai/mission/PrivateerMissionTest.java | 11 +-
.../server/ai/mission/ScoutingMissionTest.java | 65 +-
.../server/ai/mission/TransportMissionTest.java | 118 +-
.../ai/mission/UnitSeekAndDestroyMissionTest.java | 82 +-
.../net/sf/freecol/server/control/AllTests.java | 17 +-
.../server/control/InGameControllerTest.java | 1530 ++---
.../net/sf/freecol/server/generator/AllTests.java | 17 +-
.../freecol/server/generator/MapGeneratorTest.java | 161 +-
test/src/net/sf/freecol/server/model/AllTests.java | 26 +-
.../freecol/server/model/ServerBuildingTest.java | 245 +-
.../sf/freecol/server/model/ServerColonyTest.java | 285 +-
.../server/model/ServerIndianSettlementTest.java | 16 +-
.../sf/freecol/server/model/ServerPlayerTest.java | 308 +-
.../sf/freecol/server/model/ServerUnitTest.java | 211 +-
.../net/sf/freecol/util/test/FreeColTestCase.java | 227 +-
.../net/sf/freecol/util/test/FreeColTestUtils.java | 88 +-
.../net/sf/freecol/util/test/MockMapGenerator.java | 88 +-
.../sf/freecol/util/test/MockModelController.java | 33 -
.../net/sf/freecol/util/test/MockPseudoRandom.java | 35 +-
1534 files changed, 227537 insertions(+), 173145 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git
More information about the Pkg-games-commits
mailing list