[freecol] 68/125: Imported Debian patch 0.10.5+dfsg-1+deb7u1
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 20 19:39:21 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 1ab0bc47b8e1dcfcfa7d9f4f5f4c62e7461a1de2
Merge: fa9f30c 5483cfe
Author: Vincent Fourmond <fourmond at debian.org>
Date: Sat Dec 20 23:57:15 2014 +0100
Imported Debian patch 0.10.5+dfsg-1+deb7u1
README | 4 +-
build.xml | 262 +-
build.xml.orig | 753 ---
data/audio/music/aztec.ogg | Bin 116065 -> 0 bytes
data/audio/sfx/anthem_dutch.wav | Bin 88932 -> 0 bytes
data/audio/sfx/anthem_english.wav | Bin 83728 -> 0 bytes
data/audio/sfx/anthem_french.wav | Bin 88592 -> 0 bytes
data/audio/sfx/anthem_spanish.wav | Bin 83922 -> 0 bytes
data/audio/sfx/attack_naval.ogg | Bin 26169 -> 0 bytes
data/audio/sfx/building_complete.ogg | Bin 24130 -> 0 bytes
data/audio/sfx/illegal_move.wav | Bin 20992 -> 0 bytes
data/audio/sfx/load_cargo.wav | Bin 22108 -> 0 bytes
data/audio/sfx/sunk.ogg | Bin 46310 -> 0 bytes
data/base/client-options.xml | 207 +
data/base/resources.properties | 89 +-
data/{ => base/resources}/fonts/Imperator.ttf | Bin
data/base/resources/fonts/LiberationSerif-Bold.ttf | Bin 0 -> 129416 bytes
.../resources/fonts/LiberationSerif-BoldItalic.ttf | Bin 0 -> 100392 bytes
.../resources/fonts/LiberationSerif-Italic.ttf | Bin 0 -> 100420 bytes
.../resources/fonts/LiberationSerif-Regular.ttf | Bin 0 -> 156076 bytes
data/{ => base/resources}/fonts/README | 0
data/{ => base/resources}/fonts/ShadowedBlack.ttf | Bin
data/{ => base/resources}/fonts/signature.faf | 0
data/base/resources/images/misc/placeholder.png | Bin 0 -> 1847 bytes
data/{freecol => base}/resources/images/ui/README | 0
data/base/resources/images/ui/bg.png | Bin 54421 -> 0 bytes
data/base/resources/images/ui/bg_paper.png | Bin 0 -> 181826 bytes
data/base/resources/images/ui/freecol.png | Bin 1155 -> 0 bytes
data/base/resources/images/ui/map.jpg | Bin 0 -> 1046754 bytes
data/base/resources/images/ui/menuborder-e.png | Bin 2831 -> 2829 bytes
data/base/resources/images/ui/menuborder-n.png | Bin 2840 -> 2829 bytes
data/base/resources/images/ui/menuborder-ne.png | Bin 172 -> 2825 bytes
data/base/resources/images/ui/menuborder-nw.png | Bin 169 -> 2827 bytes
data/base/resources/images/ui/menuborder-s.png | Bin 2840 -> 2829 bytes
data/base/resources/images/ui/menuborder-se.png | Bin 170 -> 2830 bytes
.../images/ui/menuborder-shadow-blank.png | Bin 0 -> 159 bytes
.../base/resources/images/ui/menuborder-shadow.png | Bin 0 -> 182 bytes
data/base/resources/images/ui/menuborder-sw.png | Bin 172 -> 2828 bytes
data/base/resources/images/ui/menuborder-w.png | Bin 2831 -> 2828 bytes
data/base/resources/sound/illegal.ogg | Bin 0 -> 6717 bytes
.../music => base/resources/sound}/intro.ogg | Bin
data/base/resources_ar.properties | 3 +
data/base/resources_arz.properties | 3 +
data/base/resources_be-tarask.properties | 3 +
data/base/resources_bg.properties | 3 +
data/base/resources_el.properties | 3 +
data/base/resources_fa.properties | 3 +
data/base/resources_grc.properties | 3 +
data/base/resources_he.properties | 3 +
data/base/resources_ja.properties | 3 +
data/base/resources_km.properties | 3 +
data/base/resources_mk.properties | 3 +
data/base/resources_ru.properties | 3 +
data/base/resources_ta.properties | 3 +
data/base/resources_uk.properties | 3 +
data/base/resources_zh_CN.properties | 3 +
data/classic/mod.xml | 1 -
data/classic/specification.xml | 2045 ------
data/freecol.png | Bin 0 -> 17202 bytes
data/freecol/mod.xml | 1 -
data/freecol/resources.properties | 501 --
data/freecol/resources/images/ui/bg_map1.jpg | Bin 799109 -> 0 bytes
.../resources/images/ui/boston_tea_party.jpg | Bin 100476 -> 0 bytes
data/freecol/resources/images/ui/exploration.png | Bin 96297 -> 0 bytes
data/freecol/resources/images/ui/military.png | Bin 77278 -> 0 bytes
data/freecol/resources/images/ui/native_attack.png | Bin 505010 -> 0 bytes
data/freecol/resources/images/ui/political.png | Bin 78689 -> 0 bytes
data/freecol/resources/images/ui/religious.png | Bin 70280 -> 0 bytes
data/freecol/resources/images/ui/trade.png | Bin 105008 -> 0 bytes
data/freecol/resources/images/ui/visit_natives.png | Bin 488551 -> 0 bytes
.../resources/images/units/dragoon/curregularh.png | Bin 52277 -> 0 bytes
.../resources/images/units/dragoon/danregularh.png | Bin 51434 -> 0 bytes
.../images/units/dragoon/dutchregularh.png | Bin 52254 -> 0 bytes
.../resources/images/units/dragoon/engregularh.png | Bin 51303 -> 0 bytes
.../images/units/dragoon/frenchregularh.png | Bin 52158 -> 0 bytes
.../resources/images/units/dragoon/irregularh.png | Bin 52412 -> 0 bytes
.../images/units/dragoon/portregularh.png | Bin 50684 -> 0 bytes
.../resources/images/units/dragoon/rusregularh.png | Bin 50823 -> 0 bytes
.../images/units/dragoon/scotregularh.png | Bin 51755 -> 0 bytes
.../images/units/dragoon/spanregularh.png | Bin 51775 -> 0 bytes
.../images/units/dragoon/svenregularh.png | Bin 52162 -> 0 bytes
.../resources/images/units/soldier/curregular.png | Bin 35576 -> 0 bytes
.../resources/images/units/soldier/danregular.png | Bin 35841 -> 0 bytes
.../images/units/soldier/dutchregular.png | Bin 36536 -> 0 bytes
.../resources/images/units/soldier/engregular.png | Bin 35543 -> 0 bytes
.../images/units/soldier/frenchregular.png | Bin 35635 -> 0 bytes
.../resources/images/units/soldier/irregular.png | Bin 34148 -> 0 bytes
.../resources/images/units/soldier/portregular.png | Bin 33460 -> 0 bytes
.../resources/images/units/soldier/rusregular.png | Bin 33855 -> 0 bytes
.../resources/images/units/soldier/scotregular.png | Bin 34880 -> 0 bytes
.../resources/images/units/soldier/spanregular.png | Bin 36267 -> 0 bytes
.../resources/images/units/soldier/svenregular.png | Bin 36159 -> 0 bytes
data/freecol/specification.xml | 2134 -------
data/images/river/delta_NE_large.png | Bin 4126 -> 0 bytes
data/images/river/delta_NE_small.png | Bin 3678 -> 0 bytes
data/images/river/delta_NW_large.png | Bin 4221 -> 0 bytes
data/images/river/delta_NW_small.png | Bin 3679 -> 0 bytes
data/images/river/delta_SE_large.png | Bin 4144 -> 0 bytes
data/images/river/delta_SE_small.png | Bin 3661 -> 0 bytes
data/images/river/delta_SW_large.png | Bin 4083 -> 0 bytes
data/images/river/delta_SW_small.png | Bin 3639 -> 0 bytes
data/images/terrain/beach/beach1.png | Bin 1124 -> 0 bytes
data/images/terrain/beach/beach10.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach100.png | Bin 2032 -> 0 bytes
data/images/terrain/beach/beach101.png | Bin 2168 -> 0 bytes
data/images/terrain/beach/beach102.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach103.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach104.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach105.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach106.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach107.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach108.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach109.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach11.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach110.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach111.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach112.png | Bin 1883 -> 0 bytes
data/images/terrain/beach/beach113.png | Bin 2017 -> 0 bytes
data/images/terrain/beach/beach114.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach115.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach116.png | Bin 2032 -> 0 bytes
data/images/terrain/beach/beach117.png | Bin 2168 -> 0 bytes
data/images/terrain/beach/beach118.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach119.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach12.png | Bin 1854 -> 0 bytes
data/images/terrain/beach/beach120.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach121.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach122.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach123.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach124.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach125.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach126.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach127.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach128.png | Bin 1844 -> 0 bytes
data/images/terrain/beach/beach129.png | Bin 1844 -> 0 bytes
data/images/terrain/beach/beach13.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach130.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach131.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach132.png | Bin 1998 -> 0 bytes
data/images/terrain/beach/beach133.png | Bin 1998 -> 0 bytes
data/images/terrain/beach/beach134.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach135.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach136.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach137.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach138.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach139.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach14.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach140.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach141.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach142.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach143.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach144.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach145.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach146.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach147.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach148.png | Bin 2146 -> 0 bytes
data/images/terrain/beach/beach149.png | Bin 2146 -> 0 bytes
data/images/terrain/beach/beach15.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach150.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach151.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach152.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach153.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach154.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach155.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach156.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach157.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach158.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach159.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach16.png | Bin 1136 -> 0 bytes
data/images/terrain/beach/beach160.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach161.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach162.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach163.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach164.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach165.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach166.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach167.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach168.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach169.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach17.png | Bin 1288 -> 0 bytes
data/images/terrain/beach/beach170.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach171.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach172.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach173.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach174.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach175.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach176.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach177.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach178.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach179.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach18.png | Bin 1982 -> 0 bytes
data/images/terrain/beach/beach180.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach181.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach182.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach183.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach184.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach185.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach186.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach187.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach188.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach189.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach19.png | Bin 1982 -> 0 bytes
data/images/terrain/beach/beach190.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach191.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach192.png | Bin 1844 -> 0 bytes
data/images/terrain/beach/beach193.png | Bin 1844 -> 0 bytes
data/images/terrain/beach/beach194.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach195.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach196.png | Bin 1998 -> 0 bytes
data/images/terrain/beach/beach197.png | Bin 1998 -> 0 bytes
data/images/terrain/beach/beach198.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach199.png | Bin 2532 -> 0 bytes
data/images/terrain/beach/beach2.png | Bin 1829 -> 0 bytes
data/images/terrain/beach/beach20.png | Bin 1285 -> 0 bytes
data/images/terrain/beach/beach200.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach201.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach202.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach203.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach204.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach205.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach206.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach207.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach208.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach209.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach21.png | Bin 1440 -> 0 bytes
data/images/terrain/beach/beach210.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach211.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach212.png | Bin 2146 -> 0 bytes
data/images/terrain/beach/beach213.png | Bin 2146 -> 0 bytes
data/images/terrain/beach/beach214.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach215.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach216.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach217.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach218.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach219.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach22.png | Bin 1982 -> 0 bytes
data/images/terrain/beach/beach220.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach221.png | Bin 2683 -> 0 bytes
data/images/terrain/beach/beach222.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach223.png | Bin 3227 -> 0 bytes
data/images/terrain/beach/beach224.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach225.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach226.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach227.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach228.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach229.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach23.png | Bin 1982 -> 0 bytes
data/images/terrain/beach/beach230.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach231.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach232.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach233.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach234.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach235.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach236.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach237.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach238.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach239.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach24.png | Bin 1854 -> 0 bytes
data/images/terrain/beach/beach240.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach241.png | Bin 2548 -> 0 bytes
data/images/terrain/beach/beach242.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach243.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach244.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach245.png | Bin 2702 -> 0 bytes
data/images/terrain/beach/beach246.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach247.png | Bin 3246 -> 0 bytes
data/images/terrain/beach/beach248.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach249.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach25.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach250.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach251.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach252.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach253.png | Bin 3253 -> 0 bytes
data/images/terrain/beach/beach254.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach255.png | Bin 3779 -> 0 bytes
data/images/terrain/beach/beach26.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach27.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach28.png | Bin 1854 -> 0 bytes
data/images/terrain/beach/beach29.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach3.png | Bin 1829 -> 0 bytes
data/images/terrain/beach/beach30.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach31.png | Bin 2522 -> 0 bytes
data/images/terrain/beach/beach32.png | Bin 1883 -> 0 bytes
data/images/terrain/beach/beach33.png | Bin 2017 -> 0 bytes
data/images/terrain/beach/beach34.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach35.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach36.png | Bin 2032 -> 0 bytes
data/images/terrain/beach/beach37.png | Bin 2168 -> 0 bytes
data/images/terrain/beach/beach38.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach39.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach4.png | Bin 1121 -> 0 bytes
data/images/terrain/beach/beach40.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach41.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach42.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach43.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach44.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach45.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach46.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach47.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach48.png | Bin 1883 -> 0 bytes
data/images/terrain/beach/beach49.png | Bin 2017 -> 0 bytes
data/images/terrain/beach/beach5.png | Bin 1277 -> 0 bytes
data/images/terrain/beach/beach50.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach51.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach52.png | Bin 2032 -> 0 bytes
data/images/terrain/beach/beach53.png | Bin 2168 -> 0 bytes
data/images/terrain/beach/beach54.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach55.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach56.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach57.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach58.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach59.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach6.png | Bin 1829 -> 0 bytes
data/images/terrain/beach/beach60.png | Bin 2589 -> 0 bytes
data/images/terrain/beach/beach61.png | Bin 2735 -> 0 bytes
data/images/terrain/beach/beach62.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach63.png | Bin 3258 -> 0 bytes
data/images/terrain/beach/beach64.png | Bin 1141 -> 0 bytes
data/images/terrain/beach/beach65.png | Bin 1294 -> 0 bytes
data/images/terrain/beach/beach66.png | Bin 1996 -> 0 bytes
data/images/terrain/beach/beach67.png | Bin 1996 -> 0 bytes
data/images/terrain/beach/beach68.png | Bin 1291 -> 0 bytes
data/images/terrain/beach/beach69.png | Bin 1448 -> 0 bytes
data/images/terrain/beach/beach7.png | Bin 1829 -> 0 bytes
data/images/terrain/beach/beach70.png | Bin 1996 -> 0 bytes
data/images/terrain/beach/beach71.png | Bin 1996 -> 0 bytes
data/images/terrain/beach/beach72.png | Bin 2016 -> 0 bytes
data/images/terrain/beach/beach73.png | Bin 2159 -> 0 bytes
data/images/terrain/beach/beach74.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach75.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach76.png | Bin 2016 -> 0 bytes
data/images/terrain/beach/beach77.png | Bin 2159 -> 0 bytes
data/images/terrain/beach/beach78.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach79.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach8.png | Bin 1854 -> 0 bytes
data/images/terrain/beach/beach80.png | Bin 1302 -> 0 bytes
data/images/terrain/beach/beach81.png | Bin 1455 -> 0 bytes
data/images/terrain/beach/beach82.png | Bin 2147 -> 0 bytes
data/images/terrain/beach/beach83.png | Bin 2147 -> 0 bytes
data/images/terrain/beach/beach84.png | Bin 1456 -> 0 bytes
data/images/terrain/beach/beach85.png | Bin 1600 -> 0 bytes
data/images/terrain/beach/beach86.png | Bin 2147 -> 0 bytes
data/images/terrain/beach/beach87.png | Bin 2147 -> 0 bytes
data/images/terrain/beach/beach88.png | Bin 2016 -> 0 bytes
data/images/terrain/beach/beach89.png | Bin 2159 -> 0 bytes
data/images/terrain/beach/beach9.png | Bin 1995 -> 0 bytes
data/images/terrain/beach/beach90.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach91.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach92.png | Bin 2016 -> 0 bytes
data/images/terrain/beach/beach93.png | Bin 2159 -> 0 bytes
data/images/terrain/beach/beach94.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach95.png | Bin 2693 -> 0 bytes
data/images/terrain/beach/beach96.png | Bin 1883 -> 0 bytes
data/images/terrain/beach/beach97.png | Bin 2017 -> 0 bytes
data/images/terrain/beach/beach98.png | Bin 2694 -> 0 bytes
data/images/terrain/beach/beach99.png | Bin 2694 -> 0 bytes
data/images/terrain/desert/center0.png | Bin 5950 -> 0 bytes
data/images/terrain/desert/center1.png | Bin 5945 -> 0 bytes
data/images/terrain/terrain13/border_E_even.png | Bin 6212 -> 0 bytes
data/images/terrain/terrain13/border_E_odd.png | Bin 6140 -> 0 bytes
data/images/terrain/terrain13/border_NE_even.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_NE_odd.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_NW_even.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_NW_odd.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_N_even.png | Bin 7977 -> 0 bytes
data/images/terrain/terrain13/border_N_odd.png | Bin 7467 -> 0 bytes
data/images/terrain/terrain13/border_SE_even.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_SE_odd.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_SW_even.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_SW_odd.png | Bin 7932 -> 0 bytes
data/images/terrain/terrain13/border_S_even.png | Bin 7362 -> 0 bytes
data/images/terrain/terrain13/border_S_odd.png | Bin 6565 -> 0 bytes
data/images/terrain/terrain13/border_W_even.png | Bin 5266 -> 0 bytes
data/images/terrain/terrain13/border_W_odd.png | Bin 3293 -> 0 bytes
data/images/terrain/terrain13/center0.png | Bin 10033 -> 0 bytes
data/images/terrain/terrain13/center1.png | Bin 10107 -> 0 bytes
data/maps/Africa.fsg | Bin 54202 -> 103480 bytes
data/maps/Africa.png | Bin 4218 -> 0 bytes
data/maps/America_large.fsg | Bin 0 -> 152651 bytes
data/maps/Australia.fsg | Bin 26902 -> 68792 bytes
data/maps/Australia.png | Bin 4252 -> 0 bytes
data/maps/Caribbean_basin.fsg | Bin 0 -> 50981 bytes
data/maps/america-large.fsg | Bin 98191 -> 0 bytes
data/maps/america-large.png | Bin 4568 -> 0 bytes
data/maps/caribbean-basin.fsg | Bin 15226 -> 0 bytes
data/maps/caribbean-basin.png | Bin 4195 -> 0 bytes
data/mods/classic_ui/FreeColMessages.properties | 3 +
data/mods/classic_ui/mod.xml | 1 +
data/mods/classic_ui/resources.properties | 46 +
.../resources/images/ui/infopanel-skin.png | Bin
.../resources/images/ui/menuborder-e.png | Bin
.../resources/images/ui/menuborder-n.png | Bin
.../resources/images/ui/menuborder-ne.png | Bin
.../resources/images/ui/menuborder-nw.png | Bin
.../resources/images/ui/menuborder-s.png | Bin
.../resources/images/ui/menuborder-se.png | Bin
.../resources/images/ui/menuborder-shadow-s.png | Bin
.../resources/images/ui/menuborder-shadow-se.png | Bin
.../resources/images/ui/menuborder-shadow-sw.png | Bin
.../resources/images/ui/menuborder-sw.png | Bin
.../resources/images/ui/menuborder-w.png | Bin
.../resources/images/ui/minimap-skin.png | Bin
.../images/ui/order-buttons/disabled/zoom_in.png} | Bin
.../images/ui/order-buttons/disabled/zoom_out.png} | Bin
.../ui/order-buttons/highlighted/zoom_in.png} | Bin
.../ui/order-buttons/highlighted/zoom_out.png} | Bin
.../images/ui/order-buttons/normal/zoom_in.png} | Bin
.../images/ui/order-buttons/normal/zoom_out.png} | Bin
.../images/ui/order-buttons/pressed/zoom_in.png} | Bin
.../images/ui/order-buttons/pressed/zoom_out.png} | Bin
.../classic_ui/resources/images/ui/paper.png} | Bin
data/mods/example/mod.xml | 2 +-
data/mods/example/specification.xml | 30 +
data/mods/hutzli/FreeColMessages.properties | 3 +
data/mods/hutzli/mod.xml | 1 +
data/mods/hutzli/resources.properties | 63 +
data/mods/hutzli/resources/images/goods/bells.png | Bin 0 -> 3493 bytes
data/mods/hutzli/resources/images/goods/cigars.png | Bin 0 -> 3330 bytes
data/mods/hutzli/resources/images/goods/cloth.png | Bin 0 -> 3674 bytes
data/mods/hutzli/resources/images/goods/coats.png | Bin 0 -> 3679 bytes
data/mods/hutzli/resources/images/goods/cotton.png | Bin 0 -> 3884 bytes
.../mods/hutzli/resources/images/goods/crosses.png | Bin 0 -> 3145 bytes
data/mods/hutzli/resources/images/goods/fish.png | Bin 0 -> 3597 bytes
data/mods/hutzli/resources/images/goods/food.png | Bin 0 -> 3612 bytes
data/mods/hutzli/resources/images/goods/furs.png | Bin 0 -> 1821 bytes
.../mods/hutzli/resources/images/goods/hammers.png | Bin 0 -> 3430 bytes
data/mods/hutzli/resources/images/goods/horses.png | Bin 0 -> 1750 bytes
data/mods/hutzli/resources/images/goods/lumber.png | Bin 0 -> 3670 bytes
.../mods/hutzli/resources/images/goods/muskets.png | Bin 0 -> 3320 bytes
data/mods/hutzli/resources/images/goods/ore.png | Bin 0 -> 3807 bytes
data/mods/hutzli/resources/images/goods/rum.png | Bin 0 -> 3600 bytes
data/mods/hutzli/resources/images/goods/silver.png | Bin 0 -> 3652 bytes
data/mods/hutzli/resources/images/goods/sugar.png | Bin 0 -> 3712 bytes
.../mods/hutzli/resources/images/goods/tobacco.png | Bin 0 -> 3601 bytes
data/mods/hutzli/resources/images/goods/tools.png | Bin 0 -> 3450 bytes
.../hutzli/resources/images/goods/tradeGoods.png | Bin 0 -> 3830 bytes
.../resources/images/settlements/aztec_city.png | Bin 0 -> 8328 bytes
.../resources/images/settlements/inca_city.png | Bin 0 -> 8732 bytes
.../resources/images/settlements/indian_camp.png | Bin 0 -> 10377 bytes
.../images/settlements/indian_village.png | Bin 0 -> 8055 bytes
.../resources/images/units/default/caravel.png | Bin 0 -> 6278 bytes
.../resources/images/units/default/frigate.png | Bin 0 -> 10185 bytes
.../resources/images/units/default/galleon.png | Bin 0 -> 9971 bytes
.../resources/images/units/default/manOWar.png | Bin 0 -> 12987 bytes
.../resources/images/units/default/merchantman.png | Bin 0 -> 8841 bytes
.../resources/images/units/default/privateer.png | Bin 0 -> 7854 bytes
data/mods/markovoss/FreeColMessages.properties | 20 +
data/mods/markovoss/mod.xml | 1 +
data/mods/markovoss/resources.properties | 120 +
.../images/terrain/arcticDesert}/border_E_even.png | Bin
.../images/terrain/arcticDesert}/border_E_odd.png | Bin
.../terrain/arcticDesert}/border_NE_even.png | Bin
.../images/terrain/arcticDesert}/border_NE_odd.png | Bin
.../terrain/arcticDesert}/border_NW_even.png | Bin
.../images/terrain/arcticDesert}/border_NW_odd.png | Bin
.../images/terrain/arcticDesert}/border_N_even.png | Bin
.../images/terrain/arcticDesert}/border_N_odd.png | Bin
.../terrain/arcticDesert}/border_SE_even.png | Bin
.../images/terrain/arcticDesert}/border_SE_odd.png | Bin
.../terrain/arcticDesert}/border_SW_even.png | Bin
.../images/terrain/arcticDesert}/border_SW_odd.png | Bin
.../images/terrain/arcticDesert}/border_S_even.png | Bin
.../images/terrain/arcticDesert}/border_S_odd.png | Bin
.../images/terrain/arcticDesert}/border_W_even.png | Bin
.../images/terrain/arcticDesert}/border_W_odd.png | Bin
.../images/terrain/arcticDesert/center0.png | Bin 0 -> 4376 bytes
.../images/terrain/arcticDesert/center1.png | Bin 0 -> 4376 bytes
.../images/terrain/arcticOcean}/border_E_even.png | Bin
.../images/terrain/arcticOcean}/border_E_odd.png | Bin
.../images/terrain/arcticOcean}/border_NE_even.png | Bin
.../images/terrain/arcticOcean}/border_NE_odd.png | Bin
.../images/terrain/arcticOcean}/border_NW_even.png | Bin
.../images/terrain/arcticOcean}/border_NW_odd.png | Bin
.../images/terrain/arcticOcean}/border_N_even.png | Bin
.../images/terrain/arcticOcean}/border_N_odd.png | Bin
.../images/terrain/arcticOcean}/border_SE_even.png | Bin
.../images/terrain/arcticOcean}/border_SE_odd.png | Bin
.../images/terrain/arcticOcean}/border_SW_even.png | Bin
.../images/terrain/arcticOcean}/border_SW_odd.png | Bin
.../images/terrain/arcticOcean}/border_S_even.png | Bin
.../images/terrain/arcticOcean}/border_S_odd.png | Bin
.../images/terrain/arcticOcean}/border_W_even.png | Bin
.../images/terrain/arcticOcean}/border_W_odd.png | Bin
.../images/terrain/arcticOcean/center0.png | Bin 0 -> 3997 bytes
.../images/terrain/arcticOcean/center1.png | Bin 0 -> 3713 bytes
.../images/terrain/arcticOcean2}/border_E_even.png | Bin
.../images/terrain/arcticOcean2}/border_E_odd.png | Bin
.../terrain/arcticOcean2}/border_NE_even.png | Bin
.../images/terrain/arcticOcean2}/border_NE_odd.png | Bin
.../terrain/arcticOcean2}/border_NW_even.png | Bin
.../images/terrain/arcticOcean2}/border_NW_odd.png | Bin
.../images/terrain/arcticOcean2}/border_N_even.png | Bin
.../images/terrain/arcticOcean2}/border_N_odd.png | Bin
.../terrain/arcticOcean2}/border_SE_even.png | Bin
.../images/terrain/arcticOcean2}/border_SE_odd.png | Bin
.../terrain/arcticOcean2}/border_SW_even.png | Bin
.../images/terrain/arcticOcean2}/border_SW_odd.png | Bin
.../images/terrain/arcticOcean2}/border_S_even.png | Bin
.../images/terrain/arcticOcean2}/border_S_odd.png | Bin
.../images/terrain/arcticOcean2}/border_W_even.png | Bin
.../images/terrain/arcticOcean2}/border_W_odd.png | Bin
.../images/terrain/arcticOcean2/center0.png | Bin 0 -> 4128 bytes
.../images/terrain/arcticOcean2/center0_old.png | Bin 0 -> 4313 bytes
.../images/terrain/arcticOcean2/center1.png | Bin 0 -> 4263 bytes
.../images/terrain/dryDesert/border_E_even.png | Bin 0 -> 279 bytes
.../images/terrain/dryDesert/border_E_odd.png | Bin 0 -> 284 bytes
.../images/terrain/dryDesert/border_NE_even.png | Bin 0 -> 1304 bytes
.../images/terrain/dryDesert/border_NE_odd.png | Bin 0 -> 1271 bytes
.../images/terrain/dryDesert/border_NW_even.png | Bin 0 -> 1246 bytes
.../images/terrain/dryDesert/border_NW_odd.png | Bin 0 -> 1198 bytes
.../images/terrain/dryDesert/border_N_even.png | Bin 0 -> 457 bytes
.../images/terrain/dryDesert/border_N_odd.png | Bin 0 -> 409 bytes
.../images/terrain/dryDesert/border_SE_even.png | Bin 0 -> 1266 bytes
.../images/terrain/dryDesert/border_SE_odd.png | Bin 0 -> 1280 bytes
.../images/terrain/dryDesert/border_SW_even.png | Bin 0 -> 1269 bytes
.../images/terrain/dryDesert/border_SW_odd.png | Bin 0 -> 1257 bytes
.../images/terrain/dryDesert/border_S_even.png | Bin 0 -> 451 bytes
.../images/terrain/dryDesert/border_S_odd.png | Bin 0 -> 440 bytes
.../images/terrain/dryDesert/border_W_even.png | Bin 0 -> 286 bytes
.../images/terrain/dryDesert/border_W_odd.png | Bin 0 -> 245 bytes
.../resources/images/terrain/dryDesert/center0.png | Bin 0 -> 4364 bytes
.../resources/images/terrain/dryDesert/center1.png | Bin 0 -> 4369 bytes
.../images/terrain/frozenWater}/border_E_even.png | Bin
.../images/terrain/frozenWater}/border_E_odd.png | Bin
.../images/terrain/frozenWater}/border_NE_even.png | Bin
.../images/terrain/frozenWater}/border_NE_odd.png | Bin
.../images/terrain/frozenWater}/border_NW_even.png | Bin
.../images/terrain/frozenWater}/border_NW_odd.png | Bin
.../images/terrain/frozenWater}/border_N_even.png | Bin
.../images/terrain/frozenWater}/border_N_odd.png | Bin
.../images/terrain/frozenWater}/border_SE_even.png | Bin
.../images/terrain/frozenWater}/border_SE_odd.png | Bin
.../images/terrain/frozenWater}/border_SW_even.png | Bin
.../images/terrain/frozenWater}/border_SW_odd.png | Bin
.../images/terrain/frozenWater}/border_S_even.png | Bin
.../images/terrain/frozenWater}/border_S_odd.png | Bin
.../images/terrain/frozenWater}/border_W_even.png | Bin
.../images/terrain/frozenWater}/border_W_odd.png | Bin
.../images/terrain/frozenWater/center0.png | Bin 0 -> 3056 bytes
.../images/terrain/frozenWater/center1.png | Bin 0 -> 3077 bytes
.../images/terrain/glacier}/border_E_even.png | Bin
.../images/terrain/glacier}/border_E_odd.png | Bin
.../images/terrain/glacier}/border_NE_even.png | Bin
.../images/terrain/glacier}/border_NE_odd.png | Bin
.../images/terrain/glacier}/border_NW_even.png | Bin
.../images/terrain/glacier}/border_NW_odd.png | Bin
.../images/terrain/glacier}/border_N_even.png | Bin
.../images/terrain/glacier}/border_N_odd.png | Bin
.../images/terrain/glacier}/border_SE_even.png | Bin
.../images/terrain/glacier}/border_SE_odd.png | Bin
.../images/terrain/glacier}/border_SW_even.png | Bin
.../images/terrain/glacier}/border_SW_odd.png | Bin
.../images/terrain/glacier}/border_S_even.png | Bin
.../images/terrain/glacier}/border_S_odd.png | Bin
.../images/terrain/glacier}/border_W_even.png | Bin
.../images/terrain/glacier}/border_W_odd.png | Bin
.../resources/images/terrain/glacier}/center0.png | Bin
.../resources/images/terrain/glacier}/center1.png | Bin
.../images/terrain/sandDesert}/border_E_even.png | Bin
.../images/terrain/sandDesert}/border_E_odd.png | Bin
.../images/terrain/sandDesert/border_NE_even.png | Bin 0 -> 1308 bytes
.../images/terrain/sandDesert/border_NE_odd.png | Bin 0 -> 1279 bytes
.../images/terrain/sandDesert/border_NW_even.png | Bin 0 -> 1259 bytes
.../images/terrain/sandDesert/border_NW_odd.png | Bin 0 -> 1207 bytes
.../images/terrain/sandDesert}/border_N_even.png | Bin
.../images/terrain/sandDesert}/border_N_odd.png | Bin
.../images/terrain/sandDesert/border_SE_even.png | Bin 0 -> 1262 bytes
.../images/terrain/sandDesert/border_SE_odd.png | Bin 0 -> 1287 bytes
.../images/terrain/sandDesert/border_SW_even.png | Bin 0 -> 1285 bytes
.../images/terrain/sandDesert/border_SW_odd.png | Bin 0 -> 1259 bytes
.../images/terrain/sandDesert}/border_S_even.png | Bin
.../images/terrain/sandDesert}/border_S_odd.png | Bin
.../images/terrain/sandDesert}/border_W_even.png | Bin
.../images/terrain/sandDesert}/border_W_odd.png | Bin
.../images/terrain/sandDesert/center0.png | Bin 0 -> 4163 bytes
.../images/terrain/sandDesert/center1.png | Bin 0 -> 4194 bytes
data/mods/markovoss/specification.xml | 395 ++
data/mods/misiulo/FreeColMessages.properties | 3 +
data/mods/misiulo/mod.xml | 1 +
data/mods/misiulo/resources.properties | 38 +
data/mods/misiulo/resources/images/goods/Bell.png | Bin 0 -> 3484 bytes
.../misiulo/resources/images/goods/Cigar.png} | Bin
data/mods/misiulo/resources/images/goods/Cloth.png | Bin 0 -> 4995 bytes
data/mods/misiulo/resources/images/goods/Coat.png | Bin 0 -> 6324 bytes
.../mods/misiulo/resources/images/goods/Cotton.png | Bin 0 -> 4740 bytes
.../misiulo/resources/images/goods/Crosses.png | Bin 0 -> 4364 bytes
data/mods/misiulo/resources/images/goods/Fish.png | Bin 0 -> 4733 bytes
data/mods/misiulo/resources/images/goods/Food.png | Bin 0 -> 2791 bytes
data/mods/misiulo/resources/images/goods/Fur.png | Bin 0 -> 3885 bytes
.../mods/misiulo/resources/images/goods/Hammer.png | Bin 0 -> 4497 bytes
data/mods/misiulo/resources/images/goods/Horse.png | Bin 0 -> 7922 bytes
.../mods/misiulo/resources/images/goods/Lumber.png | Bin 0 -> 3968 bytes
.../mods/misiulo/resources/images/goods/Musket.png | Bin 0 -> 3750 bytes
data/mods/misiulo/resources/images/goods/Ore.png | Bin 0 -> 4461 bytes
data/mods/misiulo/resources/images/goods/Rum.png | Bin 0 -> 3996 bytes
.../mods/misiulo/resources/images/goods/Silver.png | Bin 0 -> 3883 bytes
data/mods/misiulo/resources/images/goods/Sugar.png | Bin 0 -> 4500 bytes
.../misiulo/resources/images/goods/Tobacco.png | Bin 0 -> 5527 bytes
.../misiulo/resources/images/goods/Tool.png} | Bin
.../misiulo/resources/images/goods/TradeGoods.png | Bin 0 -> 6656 bytes
.../resources/images/misc/lostcityrumour.png | Bin 0 -> 7863 bytes
.../misiulo/resources/images/misc/nativeland.png | Bin 0 -> 2962 bytes
data/mods/misiulo/resources/images/misc/plowed.png | Bin 0 -> 13833 bytes
.../resources/images/resources/Cash-Crops.png | Bin 0 -> 4962 bytes
.../misiulo/resources/images/resources/Cotton.png | Bin 0 -> 4947 bytes
.../misiulo/resources/images/resources/Fish.png | Bin 0 -> 7508 bytes
.../misiulo/resources/images/resources/Furs.png | Bin 0 -> 5278 bytes
.../misiulo/resources/images/resources/Game.png | Bin 0 -> 7292 bytes
.../misiulo/resources/images/resources/Grain.png | Bin 0 -> 4832 bytes
.../misiulo/resources/images/resources/Lumber.png | Bin 0 -> 5867 bytes
.../resources/images/resources/Minerals.png | Bin 0 -> 7000 bytes
.../misiulo/resources/images/resources/Ore.png | Bin 0 -> 3860 bytes
.../misiulo/resources/images/resources/Silver.png | Bin 0 -> 5697 bytes
.../resources/images/resources/SilverDepleted.png | Bin 0 -> 4396 bytes
.../misiulo/resources/images/resources/Sugar.png | Bin 0 -> 6069 bytes
.../misiulo/resources/images/resources/Tobacco.png | Bin 0 -> 5915 bytes
data/mods/plantForest/FreeColMessages.properties | 7 +
data/mods/plantForest/mod.xml | 1 +
.../order-buttons/disabled/plantForest.png | Bin 0 -> 5303 bytes
.../order-buttons/highlighted/plantForest.png | Bin 0 -> 5566 bytes
.../order-buttons/normal/plantForest.png | Bin 0 -> 5531 bytes
.../order-buttons/pressed/plantForest.png | Bin 0 -> 5561 bytes
data/mods/plantForest/resources.properties | 5 +
data/mods/plantForest/specification.xml | 42 +
data/rules/classic/FreeColMessages.properties | 3 +
data/rules/classic/mod.xml | 1 +
data/rules/classic/resources.properties | 1302 ++++
.../classic}/resources/images/bonus/README | 0
.../classic}/resources/images/bonus/cotton.png | Bin
.../classic}/resources/images/bonus/fish.png | Bin
.../classic}/resources/images/bonus/furs.png | Bin
.../classic}/resources/images/bonus/game.png | Bin
.../classic}/resources/images/bonus/grain.png | Bin
.../classic}/resources/images/bonus/lumber.png | Bin
.../classic}/resources/images/bonus/minerals.png | Bin
.../classic}/resources/images/bonus/oasis.png | Bin
.../classic}/resources/images/bonus/ore.png | Bin
.../classic}/resources/images/bonus/silver.png | Bin
.../classic}/resources/images/bonus/sugar.png | Bin
.../classic}/resources/images/bonus/tobacco.png | Bin
.../classic}/resources/images/buildings/armory.png | Bin
.../resources/images/buildings/arsenal.png | Bin
.../images/buildings/blacksmiths_house.png | Bin
.../images/buildings/blacksmiths_shop.png | Bin
.../images/buildings/carpenters_house.png | Bin
.../resources/images/buildings/cathedral.png | Bin
.../classic}/resources/images/buildings/chapel.png | Bin
.../classic}/resources/images/buildings/church.png | Bin
.../resources/images/buildings/cigar_factory.png | Bin
.../resources/images/buildings/college.png | Bin
.../resources/images/buildings/custom_house.png | Bin
.../resources/images/buildings/default.png | Bin
.../classic}/resources/images/buildings/depot.png | Bin
.../images/buildings/distillers_house.png | Bin
.../classic}/resources/images/buildings/docks.png | Bin
.../resources/images/buildings/drydock.png | Bin
.../classic}/resources/images/buildings/fort.png | Bin
.../resources/images/buildings/fortress.png | Bin
.../resources/images/buildings/fur_factory.png | Bin
.../images/buildings/fur_traders_house.png | Bin
.../images/buildings/fur_traders_shop.png | Bin
.../resources/images/buildings/ironworks.png | Bin
.../resources/images/buildings/lumber_mill.png | Bin
.../resources/images/buildings/magazine.png | Bin
.../resources/images/buildings/newspaper.png | Bin
.../resources/images/buildings/pasture.png | Bin
.../resources/images/buildings/printing_press.png | Bin
.../resources/images/buildings/rum_distillery.png | Bin
.../resources/images/buildings/rum_factory.png | Bin
.../resources/images/buildings/schoolhouse.png | Bin
.../resources/images/buildings/shipyard.png | Bin
.../classic}/resources/images/buildings/stable.png | Bin
.../resources/images/buildings/stockade.png | Bin
.../resources/images/buildings/textile_mill.png | Bin
.../images/buildings/tobacconists_house.png | Bin
.../images/buildings/tobacconists_shop.png | Bin
.../resources/images/buildings/townhall.png | Bin
.../resources/images/buildings/university.png | Bin
.../resources/images/buildings/warehouse.png | Bin
.../images/buildings/warehouse_expansion.png | Bin
.../resources/images/buildings/weavers_house.png | Bin
.../resources/images/buildings/weavers_shop.png | Bin
.../resources/images/coat-of-arms/dutch-ref.png | Bin
.../resources/images/coat-of-arms/dutch.png | Bin
.../resources/images/coat-of-arms/english-ref.png | Bin
.../resources/images/coat-of-arms/english.png | Bin
.../resources/images/coat-of-arms/french-ref.png | Bin
.../resources/images/coat-of-arms/french.png | Bin
.../resources/images/coat-of-arms/native.png | Bin
.../resources/images/coat-of-arms/spanish-ref.png | Bin
.../resources/images/coat-of-arms/spanish.png | Bin
.../classic/resources}/images/forest/boreal.png | Bin
.../classic/resources}/images/forest/broadleaf.png | Bin
.../classic/resources}/images/forest/conifer.png | Bin
.../classic/resources}/images/forest/mixed.png | Bin
.../classic/resources}/images/forest/rain.png | Bin
.../classic/resources}/images/forest/scrub.png | Bin
.../classic/resources}/images/forest/tropical.png | Bin
.../classic/resources}/images/forest/wetland.png | Bin
.../images/foundingFathers/adamSmith.jpg} | Bin
.../foundingFathers}/bartolomeDeLasCasas.jpg | Bin
.../images/foundingFathers/benjaminFranklin.jpg} | Bin
.../resources/images/foundingFathers}/brewster.jpg | Bin
.../resources/images/foundingFathers}/cortes.jpg | Bin
.../images/foundingFathers/francisDrake.jpg} | Bin
.../foundingFathers}/franciscoDeCoronado.jpg | Bin
.../images/foundingFathers/georgeWashington.jpg} | Bin
.../images/foundingFathers/henryHudson.jpg} | Bin
.../images/foundingFathers}/hernandoDeSoto.jpg | Bin
.../images/foundingFathers/jacobFugger.jpg} | Bin
.../images/foundingFathers/janDeWitt.jpg} | Bin
.../images/foundingFathers}/jeanDeBrebeuf.jpg | Bin
.../images/foundingFathers/johnPaulJones.jpg} | Bin
.../images/foundingFathers}/juanDeSepulveda.jpg | Bin
.../resources/images/foundingFathers}/laSalle.jpg | Bin
.../resources/images/foundingFathers}/magellan.jpg | Bin
.../images/foundingFathers/paulRevere.jpg} | Bin
.../images/foundingFathers/peterMinuit.jpg} | Bin
.../images/foundingFathers/peterStuyvesant.jpg} | Bin
.../images/foundingFathers}/pocahontas.jpg | Bin
.../images/foundingFathers/simonBolivar.jpg} | Bin
.../images/foundingFathers/thomasJefferson.jpg} | Bin
.../images/foundingFathers/thomasPaine.jpg} | Bin
.../images/foundingFathers/williamPenn.jpg} | Bin
data/rules/classic/resources/images/goods/README | 2 +
.../classic}/resources/images/goods/bells.png | Bin
.../classic}/resources/images/goods/cigars.png | Bin
.../classic}/resources/images/goods/cloth.png | Bin
.../classic}/resources/images/goods/coats.png | Bin
.../classic}/resources/images/goods/cotton.png | Bin
.../classic}/resources/images/goods/crosses.png | Bin
.../classic}/resources/images/goods/fish.png | Bin
.../classic}/resources/images/goods/food.png | Bin
.../classic}/resources/images/goods/furs.png | Bin
.../rules/classic/resources/images/goods/grain.png | Bin 0 -> 1354 bytes
.../classic}/resources/images/goods/hammers.png | Bin
.../classic}/resources/images/goods/horses.png | Bin
.../classic}/resources/images/goods/lumber.png | Bin
data/rules/classic/resources/images/goods/meat.png | Bin 0 -> 2431 bytes
.../classic}/resources/images/goods/muskets.png | Bin
.../classic}/resources/images/goods/ore.png | Bin
.../classic}/resources/images/goods/rum.png | Bin
.../classic}/resources/images/goods/silver.png | Bin
.../classic}/resources/images/goods/sugar.png | Bin
.../classic}/resources/images/goods/tobacco.png | Bin
.../classic}/resources/images/goods/tools.png | Bin
.../classic}/resources/images/goods/tradeGoods.png | Bin
.../classic}/resources/images/misc/haloDark.png | Bin
.../resources/images/misc/lostCityRumour.png | Bin
.../classic}/resources/images/misc/nativeLand.png | Bin
.../classic}/resources/images/misc/plowed.png | Bin
.../classic}/resources/images/misc/tileTaken.png | Bin
.../resources/images/monarch/atahualpa.png | Bin
.../resources/images/monarch/elizabeth.png | Bin
.../classic}/resources/images/monarch/felipe.png | Bin
.../classic}/resources/images/monarch/geronimo.png | Bin
.../classic}/resources/images/monarch/louis.png | Bin
.../classic}/resources/images/monarch/louis2.png | Bin
.../resources/images/monarch/moctezuma.png | Bin
.../classic}/resources/images/monarch/philip.png | Bin
.../resources/images/monarch/segoyewatha.png | Bin
.../resources/images/monarch/taoyateduta.png | Bin
.../resources/images/monarch/wahktageli.png | Bin
.../classic}/resources/images/monarch/william.png | Bin
.../resources/images/river/delta_NE_large.png | Bin 0 -> 5908 bytes
.../resources/images/river/delta_NE_small.png | Bin 0 -> 4778 bytes
.../resources/images/river/delta_NW_large.png | Bin 0 -> 6023 bytes
.../resources/images/river/delta_NW_small.png | Bin 0 -> 4863 bytes
.../resources/images/river/delta_SE_large.png | Bin 0 -> 5922 bytes
.../resources/images/river/delta_SE_small.png | Bin 0 -> 4839 bytes
.../resources/images/river/delta_SW_large.png | Bin 0 -> 5802 bytes
.../resources/images/river/delta_SW_small.png | Bin 0 -> 4807 bytes
.../classic/resources}/images/river/river0.png | Bin
.../classic/resources}/images/river/river1.png | Bin
.../classic/resources}/images/river/river10.png | Bin
.../classic/resources}/images/river/river11.png | Bin
.../classic/resources}/images/river/river12.png | Bin
.../classic/resources}/images/river/river13.png | Bin
.../classic/resources}/images/river/river14.png | Bin
.../classic/resources}/images/river/river15.png | Bin
.../classic/resources}/images/river/river16.png | Bin
.../classic/resources}/images/river/river17.png | Bin
.../classic/resources}/images/river/river18.png | Bin
.../classic/resources}/images/river/river19.png | Bin
.../classic/resources}/images/river/river2.png | Bin
.../classic/resources}/images/river/river20.png | Bin
.../classic/resources}/images/river/river21.png | Bin
.../classic/resources}/images/river/river22.png | Bin
.../classic/resources}/images/river/river23.png | Bin
.../classic/resources}/images/river/river24.png | Bin
.../classic/resources}/images/river/river25.png | Bin
.../classic/resources}/images/river/river26.png | Bin
.../classic/resources}/images/river/river27.png | Bin
.../classic/resources}/images/river/river28.png | Bin
.../classic/resources}/images/river/river29.png | Bin
.../classic/resources}/images/river/river3.png | Bin
.../classic/resources}/images/river/river30.png | Bin
.../classic/resources}/images/river/river31.png | Bin
.../classic/resources}/images/river/river32.png | Bin
.../classic/resources}/images/river/river33.png | Bin
.../classic/resources}/images/river/river34.png | Bin
.../classic/resources}/images/river/river35.png | Bin
.../classic/resources}/images/river/river36.png | Bin
.../classic/resources}/images/river/river37.png | Bin
.../classic/resources}/images/river/river38.png | Bin
.../classic/resources}/images/river/river39.png | Bin
.../classic/resources}/images/river/river4.png | Bin
.../classic/resources}/images/river/river40.png | Bin
.../classic/resources}/images/river/river41.png | Bin
.../classic/resources}/images/river/river42.png | Bin
.../classic/resources}/images/river/river43.png | Bin
.../classic/resources}/images/river/river44.png | Bin
.../classic/resources}/images/river/river45.png | Bin
.../classic/resources}/images/river/river46.png | Bin
.../classic/resources}/images/river/river47.png | Bin
.../classic/resources}/images/river/river48.png | Bin
.../classic/resources}/images/river/river49.png | Bin
.../classic/resources}/images/river/river5.png | Bin
.../classic/resources}/images/river/river50.png | Bin
.../classic/resources}/images/river/river51.png | Bin
.../classic/resources}/images/river/river52.png | Bin
.../classic/resources}/images/river/river53.png | Bin
.../classic/resources}/images/river/river54.png | Bin
.../classic/resources}/images/river/river55.png | Bin
.../classic/resources}/images/river/river56.png | Bin
.../classic/resources}/images/river/river57.png | Bin
.../classic/resources}/images/river/river58.png | Bin
.../classic/resources}/images/river/river59.png | Bin
.../classic/resources}/images/river/river6.png | Bin
.../classic/resources}/images/river/river60.png | Bin
.../classic/resources}/images/river/river61.png | Bin
.../classic/resources}/images/river/river62.png | Bin
.../classic/resources}/images/river/river63.png | Bin
.../classic/resources}/images/river/river64.png | Bin
.../classic/resources}/images/river/river65.png | Bin
.../classic/resources}/images/river/river66.png | Bin
.../classic/resources}/images/river/river67.png | Bin
.../classic/resources}/images/river/river68.png | Bin
.../classic/resources}/images/river/river69.png | Bin
.../classic/resources}/images/river/river7.png | Bin
.../classic/resources}/images/river/river70.png | Bin
.../classic/resources}/images/river/river71.png | Bin
.../classic/resources}/images/river/river72.png | Bin
.../classic/resources}/images/river/river73.png | Bin
.../classic/resources}/images/river/river74.png | Bin
.../classic/resources}/images/river/river75.png | Bin
.../classic/resources}/images/river/river76.png | Bin
.../classic/resources}/images/river/river77.png | Bin
.../classic/resources}/images/river/river78.png | Bin
.../classic/resources}/images/river/river79.png | Bin
.../classic/resources}/images/river/river8.png | Bin
.../classic/resources}/images/river/river80.png | Bin
.../classic/resources}/images/river/river9.png | Bin
.../resources/images/settlements/aztec_city.png | Bin
.../resources/images/settlements/inca_city.png | Bin
.../resources/images/settlements/indian_camp.png | Bin
.../images/settlements/indian_village.png | Bin
.../resources/images/settlements/large.png | Bin
.../resources/images/settlements/large_fort.png | Bin
.../images/settlements/large_fortress.png | Bin
.../images/settlements/large_stockade.png | Bin
.../resources/images/settlements/medium.png | Bin
.../resources/images/settlements/medium_fort.png | Bin
.../images/settlements/medium_stockade.png | Bin
.../resources/images/settlements/small.png | Bin
.../images/settlements/small_stockade.png | Bin
.../resources/images/settlements/undead.png | Bin
.../images/terrain/arctic/border_E_even.png | Bin
.../images/terrain/arctic/border_E_odd.png | Bin
.../images/terrain/arctic/border_NE_even.png | Bin
.../images/terrain/arctic/border_NE_odd.png | Bin
.../images/terrain/arctic/border_NW_even.png | Bin
.../images/terrain/arctic/border_NW_odd.png | Bin
.../images/terrain/arctic/border_N_even.png | Bin
.../images/terrain/arctic/border_N_odd.png | Bin
.../images/terrain/arctic/border_SE_even.png | Bin
.../images/terrain/arctic/border_SE_odd.png | Bin
.../images/terrain/arctic/border_SW_even.png | Bin
.../images/terrain/arctic/border_SW_odd.png | Bin
.../images/terrain/arctic/border_S_even.png | Bin
.../images/terrain/arctic/border_S_odd.png | Bin
.../images/terrain/arctic/border_W_even.png | Bin
.../images/terrain/arctic/border_W_odd.png | Bin
.../resources}/images/terrain/arctic/center0.png | Bin
.../resources}/images/terrain/arctic/center1.png | Bin
.../images/terrain/beach/border_E_even.png | Bin
.../images/terrain/beach/border_E_odd.png | Bin
.../images/terrain/beach/border_NE_even.png | Bin
.../images/terrain/beach/border_NE_odd.png | Bin
.../images/terrain/beach/border_NW_even.png | Bin
.../images/terrain/beach/border_NW_odd.png | Bin
.../images/terrain/beach/border_N_even.png | Bin
.../images/terrain/beach/border_N_odd.png | Bin
.../images/terrain/beach/border_SE_even.png | Bin
.../images/terrain/beach/border_SE_odd.png | Bin
.../images/terrain/beach/border_SW_even.png | Bin
.../images/terrain/beach/border_SW_odd.png | Bin
.../images/terrain/beach/border_S_even.png | Bin
.../images/terrain/beach/border_S_odd.png | Bin
.../images/terrain/beach/border_W_even.png | Bin
.../images/terrain/beach/border_W_odd.png | Bin
.../images/terrain/beach/corner10_even.png | Bin 0 -> 1281 bytes
.../images/terrain/beach/corner10_odd.png | Bin 0 -> 1215 bytes
.../images/terrain/beach/corner11_even.png | Bin 0 -> 1909 bytes
.../images/terrain/beach/corner11_odd.png | Bin 0 -> 1945 bytes
.../images/terrain/beach/corner12_even.png | Bin 0 -> 1540 bytes
.../images/terrain/beach/corner12_odd.png | Bin 0 -> 1927 bytes
.../images/terrain/beach/corner13_even.png | Bin 0 -> 2145 bytes
.../images/terrain/beach/corner13_odd.png | Bin 0 -> 2624 bytes
.../images/terrain/beach/corner14_even.png | Bin 0 -> 1893 bytes
.../images/terrain/beach/corner14_odd.png | Bin 0 -> 2269 bytes
.../images/terrain/beach/corner15_even.png | Bin 0 -> 2488 bytes
.../images/terrain/beach/corner15_odd.png | Bin 0 -> 2969 bytes
.../images/terrain/beach/corner1_even.png} | Bin
.../images/terrain/beach/corner1_odd.png} | Bin
.../images/terrain/beach/corner2_even.png} | Bin
.../images/terrain/beach/corner2_odd.png} | Bin
.../images/terrain/beach/corner3_even.png | Bin 0 -> 1416 bytes
.../resources/images/terrain/beach/corner3_odd.png | Bin 0 -> 1555 bytes
.../images/terrain/beach/corner4_even.png} | Bin
.../images/terrain/beach/corner4_odd.png} | Bin
.../images/terrain/beach/corner5_even.png | Bin 0 -> 1644 bytes
.../resources/images/terrain/beach/corner5_odd.png | Bin 0 -> 2201 bytes
.../images/terrain/beach/corner6_even.png | Bin 0 -> 1399 bytes
.../resources/images/terrain/beach/corner6_odd.png | Bin 0 -> 1892 bytes
.../images/terrain/beach/corner7_even.png | Bin 0 -> 2009 bytes
.../resources/images/terrain/beach/corner7_odd.png | Bin 0 -> 2592 bytes
.../images/terrain/beach/corner8_even.png} | Bin
.../images/terrain/beach/corner8_odd.png} | Bin
.../images/terrain/beach/corner9_even.png | Bin 0 -> 1565 bytes
.../resources/images/terrain/beach/corner9_odd.png | Bin 0 -> 1585 bytes
.../resources/images/terrain/beach/edge10_even.png | Bin 0 -> 6826 bytes
.../resources/images/terrain/beach/edge10_odd.png | Bin 0 -> 6579 bytes
.../resources/images/terrain/beach/edge11_even.png | Bin 0 -> 6889 bytes
.../resources/images/terrain/beach/edge11_odd.png | Bin 0 -> 7749 bytes
.../resources/images/terrain/beach/edge12_even.png | Bin 0 -> 5233 bytes
.../resources/images/terrain/beach/edge12_odd.png | Bin 0 -> 5268 bytes
.../resources/images/terrain/beach/edge13_even.png | Bin 0 -> 6920 bytes
.../resources/images/terrain/beach/edge13_odd.png | Bin 0 -> 7206 bytes
.../resources/images/terrain/beach/edge14_even.png | Bin 0 -> 6924 bytes
.../resources/images/terrain/beach/edge14_odd.png | Bin 0 -> 7114 bytes
.../resources/images/terrain/beach/edge15_even.png | Bin 0 -> 8367 bytes
.../resources/images/terrain/beach/edge15_odd.png | Bin 0 -> 8363 bytes
.../resources/images/terrain/beach/edge1_even.png} | Bin
.../resources/images/terrain/beach/edge1_odd.png} | Bin
.../resources/images/terrain/beach/edge2_even.png} | Bin
.../resources/images/terrain/beach/edge2_odd.png} | Bin
.../resources/images/terrain/beach/edge3_even.png | Bin 0 -> 5275 bytes
.../resources/images/terrain/beach/edge3_odd.png | Bin 0 -> 5475 bytes
.../resources/images/terrain/beach/edge4_even.png} | Bin
.../resources/images/terrain/beach/edge4_odd.png} | Bin
.../resources/images/terrain/beach/edge5_even.png | Bin 0 -> 6064 bytes
.../resources/images/terrain/beach/edge5_odd.png | Bin 0 -> 6276 bytes
.../resources/images/terrain/beach/edge6_even.png | Bin 0 -> 5655 bytes
.../resources/images/terrain/beach/edge6_odd.png | Bin 0 -> 5399 bytes
.../resources/images/terrain/beach/edge7_even.png | Bin 0 -> 6934 bytes
.../resources/images/terrain/beach/edge7_odd.png | Bin 0 -> 7083 bytes
.../resources/images/terrain/beach/edge8_even.png} | Bin
.../resources/images/terrain/beach/edge8_odd.png} | Bin
.../resources/images/terrain/beach/edge9_even.png | Bin 0 -> 5596 bytes
.../resources/images/terrain/beach/edge9_odd.png | Bin 0 -> 5990 bytes
.../images/terrain/desert/border_E_even.png | Bin
.../images/terrain/desert/border_E_odd.png | Bin
.../images/terrain/desert/border_NE_even.png | Bin
.../images/terrain/desert/border_NE_odd.png | Bin
.../images/terrain/desert/border_NW_even.png | Bin
.../images/terrain/desert/border_NW_odd.png | Bin
.../images/terrain/desert/border_N_even.png | Bin
.../images/terrain/desert/border_N_odd.png | Bin
.../images/terrain/desert/border_SE_even.png | Bin
.../images/terrain/desert/border_SE_odd.png | Bin
.../images/terrain/desert/border_SW_even.png | Bin
.../images/terrain/desert/border_SW_odd.png | Bin
.../images/terrain/desert/border_S_even.png | Bin
.../images/terrain/desert/border_S_odd.png | Bin
.../images/terrain/desert/border_W_even.png | Bin
.../images/terrain/desert/border_W_odd.png | Bin
.../resources/images/terrain/desert/center0.png | Bin 0 -> 9079 bytes
.../resources/images/terrain/desert/center1.png | Bin 0 -> 9079 bytes
.../images/terrain/grassland/border_E_even.png | Bin
.../images/terrain/grassland/border_E_odd.png | Bin
.../images/terrain/grassland/border_NE_even.png | Bin
.../images/terrain/grassland/border_NE_odd.png | Bin
.../images/terrain/grassland/border_NW_even.png | Bin
.../images/terrain/grassland/border_NW_odd.png | Bin
.../images/terrain/grassland/border_N_even.png | Bin
.../images/terrain/grassland/border_N_odd.png | Bin
.../images/terrain/grassland/border_SE_even.png | Bin
.../images/terrain/grassland/border_SE_odd.png | Bin
.../images/terrain/grassland/border_SW_even.png | Bin
.../images/terrain/grassland/border_SW_odd.png | Bin
.../images/terrain/grassland/border_S_even.png | Bin
.../images/terrain/grassland/border_S_odd.png | Bin
.../images/terrain/grassland/border_W_even.png | Bin
.../images/terrain/grassland/border_W_odd.png | Bin
.../images/terrain/grassland/center0.png | Bin
.../images/terrain/grassland/center1.png | Bin
.../images/terrain/highSeas/border_E_even.png | Bin
.../images/terrain/highSeas/border_E_odd.png | Bin
.../images/terrain/highSeas/border_NE_even.png | Bin
.../images/terrain/highSeas/border_NE_odd.png | Bin
.../images/terrain/highSeas/border_NW_even.png | Bin
.../images/terrain/highSeas/border_NW_odd.png | Bin
.../images/terrain/highSeas/border_N_even.png | Bin
.../images/terrain/highSeas/border_N_odd.png | Bin
.../images/terrain/highSeas/border_SE_even.png | Bin
.../images/terrain/highSeas/border_SE_odd.png | Bin
.../images/terrain/highSeas/border_SW_even.png | Bin
.../images/terrain/highSeas/border_SW_odd.png | Bin
.../images/terrain/highSeas/border_S_even.png | Bin
.../images/terrain/highSeas/border_S_odd.png | Bin
.../images/terrain/highSeas/border_W_even.png | Bin
.../images/terrain/highSeas/border_W_odd.png | Bin
.../resources}/images/terrain/highSeas/center0.png | Bin
.../resources}/images/terrain/highSeas/center1.png | Bin
.../images/terrain/hills/border_E_even.png | Bin
.../images/terrain/hills/border_E_odd.png | Bin
.../images/terrain/hills/border_NE_even.png | Bin
.../images/terrain/hills/border_NE_odd.png | Bin
.../images/terrain/hills/border_NW_even.png | Bin
.../images/terrain/hills/border_NW_odd.png | Bin
.../images/terrain/hills/border_N_even.png | Bin
.../images/terrain/hills/border_N_odd.png | Bin
.../images/terrain/hills/border_SE_even.png | Bin
.../images/terrain/hills/border_SE_odd.png | Bin
.../images/terrain/hills/border_SW_even.png | Bin
.../images/terrain/hills/border_SW_odd.png | Bin
.../images/terrain/hills/border_S_even.png | Bin
.../images/terrain/hills/border_S_odd.png | Bin
.../images/terrain/hills/border_W_even.png | Bin
.../images/terrain/hills/border_W_odd.png | Bin
.../resources}/images/terrain/hills/hill1a.png | Bin
.../resources}/images/terrain/hills/hills0.png | Bin
.../resources}/images/terrain/hills/hills1.png | Bin
.../images/terrain/marsh/border_E_even.png | Bin
.../images/terrain/marsh/border_E_odd.png | Bin
.../images/terrain/marsh/border_NE_even.png | Bin
.../images/terrain/marsh/border_NE_odd.png | Bin
.../images/terrain/marsh/border_NW_even.png | Bin
.../images/terrain/marsh/border_NW_odd.png | Bin
.../images/terrain/marsh/border_N_even.png | Bin
.../images/terrain/marsh/border_N_odd.png | Bin
.../images/terrain/marsh/border_SE_even.png | Bin
.../images/terrain/marsh/border_SE_odd.png | Bin
.../images/terrain/marsh/border_SW_even.png | Bin
.../images/terrain/marsh/border_SW_odd.png | Bin
.../images/terrain/marsh/border_S_even.png | Bin
.../images/terrain/marsh/border_S_odd.png | Bin
.../images/terrain/marsh/border_W_even.png | Bin
.../images/terrain/marsh/border_W_odd.png | Bin
.../resources}/images/terrain/marsh/center0.png | Bin
.../resources}/images/terrain/marsh/center1.png | Bin
.../images/terrain/mountains/border_E_even.png | Bin
.../images/terrain/mountains/border_E_odd.png | Bin
.../images/terrain/mountains/border_NE_even.png | Bin
.../images/terrain/mountains/border_NE_odd.png | Bin
.../images/terrain/mountains/border_NW_even.png | Bin
.../images/terrain/mountains/border_NW_odd.png | Bin
.../images/terrain/mountains/border_N_even.png | Bin
.../images/terrain/mountains/border_N_odd.png | Bin
.../images/terrain/mountains/border_SE_even.png | Bin
.../images/terrain/mountains/border_SE_odd.png | Bin
.../images/terrain/mountains/border_SW_even.png | Bin
.../images/terrain/mountains/border_SW_odd.png | Bin
.../images/terrain/mountains/border_S_even.png | Bin
.../images/terrain/mountains/border_S_odd.png | Bin
.../images/terrain/mountains/border_W_even.png | Bin
.../images/terrain/mountains/border_W_odd.png | Bin
.../images/terrain/mountains/mountains0.png | Bin
.../images/terrain/mountains/mountains1.png | Bin
.../images/terrain/ocean/border_E_even.png | Bin
.../images/terrain/ocean/border_E_odd.png | Bin
.../images/terrain/ocean/border_NE_even.png | Bin
.../images/terrain/ocean/border_NE_odd.png | Bin
.../images/terrain/ocean/border_NW_even.png | Bin
.../images/terrain/ocean/border_NW_odd.png | Bin
.../images/terrain/ocean/border_N_even.png | Bin
.../images/terrain/ocean/border_N_odd.png | Bin
.../images/terrain/ocean/border_SE_even.png | Bin
.../images/terrain/ocean/border_SE_odd.png | Bin
.../images/terrain/ocean/border_SW_even.png | Bin
.../images/terrain/ocean/border_SW_odd.png | Bin
.../images/terrain/ocean/border_S_even.png | Bin
.../images/terrain/ocean/border_S_odd.png | Bin
.../images/terrain/ocean/border_W_even.png | Bin
.../images/terrain/ocean/border_W_odd.png | Bin
.../resources}/images/terrain/ocean/center0.png | Bin
.../resources}/images/terrain/ocean/center1.png | Bin
.../images/terrain/plains/border_E_even.png | Bin
.../images/terrain/plains/border_E_odd.png | Bin
.../images/terrain/plains/border_NE_even.png | Bin
.../images/terrain/plains/border_NE_odd.png | Bin
.../images/terrain/plains/border_NW_even.png | Bin
.../images/terrain/plains/border_NW_odd.png | Bin
.../images/terrain/plains/border_N_even.png | Bin
.../images/terrain/plains/border_N_odd.png | Bin
.../images/terrain/plains/border_SE_even.png | Bin
.../images/terrain/plains/border_SE_odd.png | Bin
.../images/terrain/plains/border_SW_even.png | Bin
.../images/terrain/plains/border_SW_odd.png | Bin
.../images/terrain/plains/border_S_even.png | Bin
.../images/terrain/plains/border_S_odd.png | Bin
.../images/terrain/plains/border_W_even.png | Bin
.../images/terrain/plains/border_W_odd.png | Bin
.../resources}/images/terrain/plains/center0.png | Bin
.../resources}/images/terrain/plains/center1.png | Bin
.../images/terrain/prairie/border_E_even.png | Bin
.../images/terrain/prairie/border_E_odd.png | Bin
.../images/terrain/prairie/border_NE_even.png | Bin
.../images/terrain/prairie/border_NE_odd.png | Bin
.../images/terrain/prairie/border_NW_even.png | Bin
.../images/terrain/prairie/border_NW_odd.png | Bin
.../images/terrain/prairie/border_N_even.png | Bin
.../images/terrain/prairie/border_N_odd.png | Bin
.../images/terrain/prairie/border_SE_even.png | Bin
.../images/terrain/prairie/border_SE_odd.png | Bin
.../images/terrain/prairie/border_SW_even.png | Bin
.../images/terrain/prairie/border_SW_odd.png | Bin
.../images/terrain/prairie/border_S_even.png | Bin
.../images/terrain/prairie/border_S_odd.png | Bin
.../images/terrain/prairie/border_W_even.png | Bin
.../images/terrain/prairie/border_W_odd.png | Bin
.../resources}/images/terrain/prairie/center0.png | Bin
.../resources}/images/terrain/prairie/center1.png | Bin
.../images/terrain/savannah/border_E_even.png | Bin
.../images/terrain/savannah/border_E_odd.png | Bin
.../images/terrain/savannah/border_NE_even.png | Bin
.../images/terrain/savannah/border_NE_odd.png | Bin
.../images/terrain/savannah/border_NW_even.png | Bin
.../images/terrain/savannah/border_NW_odd.png | Bin
.../images/terrain/savannah/border_N_even.png | Bin
.../images/terrain/savannah/border_N_odd.png | Bin
.../images/terrain/savannah/border_SE_even.png | Bin
.../images/terrain/savannah/border_SE_odd.png | Bin
.../images/terrain/savannah/border_SW_even.png | Bin
.../images/terrain/savannah/border_SW_odd.png | Bin
.../images/terrain/savannah/border_S_even.png | Bin
.../images/terrain/savannah/border_S_odd.png | Bin
.../images/terrain/savannah/border_W_even.png | Bin
.../images/terrain/savannah/border_W_odd.png | Bin
.../resources}/images/terrain/savannah/center0.png | Bin
.../resources}/images/terrain/savannah/center1.png | Bin
.../images/terrain/swamp/border_E_even.png | Bin
.../images/terrain/swamp/border_E_odd.png | Bin
.../images/terrain/swamp/border_NE_even.png | Bin
.../images/terrain/swamp/border_NE_odd.png | Bin
.../images/terrain/swamp/border_NW_even.png | Bin
.../images/terrain/swamp/border_NW_odd.png | Bin
.../images/terrain/swamp/border_N_even.png | Bin
.../images/terrain/swamp/border_N_odd.png | Bin
.../images/terrain/swamp/border_SE_even.png | Bin
.../images/terrain/swamp/border_SE_odd.png | Bin
.../images/terrain/swamp/border_SW_even.png | Bin
.../images/terrain/swamp/border_SW_odd.png | Bin
.../images/terrain/swamp/border_S_even.png | Bin
.../images/terrain/swamp/border_S_odd.png | Bin
.../images/terrain/swamp/border_W_even.png | Bin
.../images/terrain/swamp/border_W_odd.png | Bin
.../resources}/images/terrain/swamp/center0.png | Bin
.../resources}/images/terrain/swamp/center1.png | Bin
.../images/terrain/tundra/border_E_even.png | Bin
.../images/terrain/tundra/border_E_odd.png | Bin
.../images/terrain/tundra/border_NE_even.png | Bin
.../images/terrain/tundra/border_NE_odd.png | Bin
.../images/terrain/tundra/border_NW_even.png | Bin
.../images/terrain/tundra/border_NW_odd.png | Bin
.../images/terrain/tundra/border_N_even.png | Bin
.../images/terrain/tundra/border_N_odd.png | Bin
.../images/terrain/tundra/border_SE_even.png | Bin
.../images/terrain/tundra/border_SE_odd.png | Bin
.../images/terrain/tundra/border_SW_even.png | Bin
.../images/terrain/tundra/border_SW_odd.png | Bin
.../images/terrain/tundra/border_S_even.png | Bin
.../images/terrain/tundra/border_S_odd.png | Bin
.../images/terrain/tundra/border_W_even.png | Bin
.../images/terrain/tundra/border_W_odd.png | Bin
.../resources}/images/terrain/tundra/center0.png | Bin
.../resources}/images/terrain/tundra/center1.png | Bin
.../images/terrain/unexplored/border_E_even.png | Bin
.../images/terrain/unexplored/border_E_odd.png | Bin
.../images/terrain/unexplored/border_NE_even.png | Bin
.../images/terrain/unexplored/border_NE_odd.png | Bin
.../images/terrain/unexplored/border_NW_even.png | Bin
.../images/terrain/unexplored/border_NW_odd.png | Bin
.../images/terrain/unexplored/border_N_even.png | Bin
.../images/terrain/unexplored/border_N_odd.png | Bin
.../images/terrain/unexplored/border_SE_even.png | Bin
.../images/terrain/unexplored/border_SE_odd.png | Bin
.../images/terrain/unexplored/border_SW_even.png | Bin
.../images/terrain/unexplored/border_SW_odd.png | Bin
.../images/terrain/unexplored/border_S_even.png | Bin
.../images/terrain/unexplored/border_S_odd.png | Bin
.../images/terrain/unexplored/border_W_even.png | Bin
.../images/terrain/unexplored/border_W_odd.png | Bin
.../images/terrain/unexplored/center0.png | Bin
.../images/terrain/unexplored/center1.png | Bin
.../classic}/resources/images/ui/bg_europe.jpg | Bin
.../classic}/resources/images/ui/discovery.png | Bin
.../classic}/resources/images/ui/doctor-paper.png | Bin
.../classic}/resources/images/ui/doi.png | Bin
.../classic/resources/images/ui/exploration.png | Bin 0 -> 126355 bytes
.../classic/resources/images/ui/infopanel-skin.png | Bin 0 -> 76478 bytes
.../classic}/resources/images/ui/landing.png | Bin
.../classic}/resources/images/ui/map-americas.png | Bin
.../classic}/resources/images/ui/meet_aztec.png | Bin
.../resources/images/ui/meet_europeans.png | Bin
.../classic}/resources/images/ui/meet_inca.png | Bin
.../classic}/resources/images/ui/meet_natives.png | Bin
.../rules/classic/resources/images/ui/military.png | Bin 0 -> 103045 bytes
.../classic/resources/images/ui/minimap-back.png | Bin 0 -> 59877 bytes
.../classic/resources/images/ui/minimap-skin.png | Bin 0 -> 68789 bytes
.../images/ui/order-buttons/disabled/build.png} | Bin
.../images/ui/order-buttons/disabled/clear.png} | Bin
.../images/ui/order-buttons/disabled/disband.png} | Bin
.../images/ui/order-buttons/disabled/done.png} | Bin
.../images/ui/order-buttons/disabled/fortify.png} | Bin
.../images/ui/order-buttons/disabled/plow.png} | Bin
.../images/ui/order-buttons/disabled/road.png} | Bin
.../images/ui/order-buttons/disabled/sentry.png} | Bin
.../images/ui/order-buttons/disabled/wait.png} | Bin
.../images/ui/order-buttons/disabled/zoom_in.png | Bin 0 -> 2833 bytes
.../images/ui/order-buttons/disabled/zoom_out.png | Bin 0 -> 2833 bytes
.../images/ui/order-buttons/highlighted/build.png} | Bin
.../images/ui/order-buttons/highlighted/clear.png} | Bin
.../ui/order-buttons/highlighted/disband.png} | Bin
.../images/ui/order-buttons/highlighted/done.png} | Bin
.../ui/order-buttons/highlighted/fortify.png} | Bin
.../images/ui/order-buttons/highlighted/plow.png} | Bin
.../images/ui/order-buttons/highlighted/road.png} | Bin
.../ui/order-buttons/highlighted/sentry.png} | Bin
.../images/ui/order-buttons/highlighted/wait.png} | Bin
.../ui/order-buttons/highlighted/zoom_in.png | Bin 0 -> 3708 bytes
.../ui/order-buttons/highlighted/zoom_out.png | Bin 0 -> 3639 bytes
.../images/ui/order-buttons/normal/build.png} | Bin
.../images/ui/order-buttons/normal/clear.png} | Bin
.../images/ui/order-buttons/normal/disband.png} | Bin
.../images/ui/order-buttons/normal/done.png} | Bin
.../images/ui/order-buttons/normal/fortify.png} | Bin
.../images/ui/order-buttons/normal/plow.png} | Bin
.../images/ui/order-buttons/normal/road.png} | Bin
.../images/ui/order-buttons/normal/sentry.png} | Bin
.../images/ui/order-buttons/normal/wait.png} | Bin
.../images/ui/order-buttons/normal/zoom_in.png | Bin 0 -> 3122 bytes
.../images/ui/order-buttons/normal/zoom_out.png | Bin 0 -> 3081 bytes
.../images/ui/order-buttons/pressed/build.png} | Bin
.../images/ui/order-buttons/pressed/clear.png} | Bin
.../images/ui/order-buttons/pressed/disband.png} | Bin
.../images/ui/order-buttons/pressed/done.png} | Bin
.../images/ui/order-buttons/pressed/fortify.png} | Bin
.../images/ui/order-buttons/pressed/plow.png} | Bin
.../images/ui/order-buttons/pressed/road.png} | Bin
.../images/ui/order-buttons/pressed/sentry.png} | Bin
.../images/ui/order-buttons/pressed/wait.png} | Bin
.../images/ui/order-buttons/pressed/zoom_in.png | Bin 0 -> 3122 bytes
.../images/ui/order-buttons/pressed/zoom_out.png | Bin 0 -> 3081 bytes
.../images/ui/path}/path-foot-illegal.png | Bin
.../images/ui/path}/path-foot-nextturn.png | Bin
.../resources/images/ui/path}/path-foot.png | Bin
.../images/ui/path}/path-horse-illegal.png | Bin
.../images/ui/path}/path-horse-nextturn.png | Bin
.../resources/images/ui/path}/path-horse.png | Bin
.../images/ui/path}/path-naval-illegal.png | Bin
.../images/ui/path}/path-naval-nextturn.png | Bin
.../resources/images/ui/path}/path-naval.png | Bin
.../images/ui/path}/path-wagon-illegal.png | Bin
.../images/ui/path}/path-wagon-nextturn.png | Bin
.../resources/images/ui/path}/path-wagon.png | Bin
.../classic/resources/images/ui/political.png | Bin 0 -> 103511 bytes
.../classic/resources/images/ui/religious.png | Bin 0 -> 88833 bytes
data/rules/classic/resources/images/ui/trade.png | Bin 0 -> 127410 bytes
.../classic}/resources/images/ui/victory.png | Bin
.../classic}/resources/images/units/artillery.png | Bin
.../classic}/resources/images/units/brave.png | Bin
.../classic}/resources/images/units/caravel.png | Bin
.../resources/images/units/colonialRegular.png | Bin
.../resources/images/units/damagedArtillery.png | Bin
.../resources/images/units/dragoon/brave.png | Bin
.../units/dragoon/colonialDragoon-attack-left.sza | Bin
.../units/dragoon/colonialDragoon-attack-right.sza | Bin
.../images/units/dragoon/colonialRegular.png | Bin
.../images/units/dragoon/dragoon-attack-left.sza | Bin
.../images/units/dragoon/dragoon-attack-right.sza | Bin
.../resources/images/units/dragoon/dragoon.png | Bin
.../images/units/dragoon/kingsRegular.png | Bin
.../units/dragoon/veteranDragoon-attack-left.sza | Bin
.../units/dragoon/veteranDragoon-attack-right.sza | Bin
.../images/units/dragoon/veteranSoldier.png | Bin
.../resources/images/units/elderStatesman.png | Bin
.../resources/images/units/expertFarmer.png | Bin
.../resources/images/units/expertFisherman.png | Bin
.../resources/images/units/expertFurTrapper.png | Bin
.../resources/images/units/expertLumberJack.png | Bin
.../resources/images/units/expertOreMiner.png | Bin
.../resources/images/units/expertSilverMiner.png | Bin
.../resources/images/units/firebrandPreacher.png | Bin
.../resources/images/units/flyingDutchman.png | Bin
.../resources/images/units/freeColonist.png | Bin
.../classic}/resources/images/units/frigate.png | Bin
.../classic}/resources/images/units/galleon.png | Bin
.../resources/images/units/hardyPioneer.png | Bin
.../resources/images/units/indenturedServant.png | Bin
.../resources/images/units/indianConvert.png | Bin
.../resources/images/units/jesuitMissionary.png | Bin
.../resources/images/units/kingsRegular.png | Bin
.../classic}/resources/images/units/manOWar.png | Bin
.../resources/images/units/masterBlacksmith.png | Bin
.../resources/images/units/masterCarpenter.png | Bin
.../resources/images/units/masterCottonPlanter.png | Bin
.../resources/images/units/masterDistiller.png | Bin
.../resources/images/units/masterFurTrader.png | Bin
.../resources/images/units/masterGunsmith.png | Bin
.../resources/images/units/masterSugarPlanter.png | Bin
.../images/units/masterTobaccoPlanter.png | Bin
.../resources/images/units/masterTobacconist.png | Bin
.../resources/images/units/masterWeaver.png | Bin
.../resources/images/units/merchantman.png | Bin
.../classic}/resources/images/units/milkmaid.png | Bin
.../images/units/missionary/jesuitMissionary.png | Bin
.../images/units/missionary/missionary.png | Bin
.../resources/images/units/nativeColonist.png | Bin 0 -> 3664 bytes
.../resources/images/units/nativeSoldier.png | Bin 0 -> 3939 bytes
.../resources/images/units/pettyCriminal.png | Bin
.../images/units/pioneer/hardyPioneer.png | Bin
.../resources/images/units/pioneer/pioneer.png | Bin
.../classic}/resources/images/units/privateer.png | Bin
.../classic}/resources/images/units/revenger.png | Bin
.../resources/images/units/scout/brave.png | Bin
.../images/units/scout/colonialRegular.png | Bin
.../resources/images/units/scout/kingsRegular.png | Bin
.../resources/images/units/scout/scout.png | Bin
.../resources/images/units/scout/seasonedScout.png | Bin
.../images/units/scout/veteranSoldier.png | Bin
.../resources/images/units/seasonedScout.png | Bin
.../resources/images/units/soldier/brave.png | Bin
.../units/soldier/colonialRegular-attack-left.sza | Bin
.../units/soldier/colonialRegular-attack-right.sza | Bin
.../images/units/soldier/colonialRegular.png | Bin
.../images/units/soldier/kingsRegular.png | Bin
.../images/units/soldier/soldier-attack-left.sza | Bin
.../images/units/soldier/soldier-attack-right.sza | Bin
.../resources/images/units/soldier/soldier.png | Bin
.../units/soldier/veteranSoldier-attack-left.sza | Bin
.../units/soldier/veteranSoldier-attack-right.sza | Bin
.../images/units/soldier/veteranSoldier.png | Bin
.../resources/images/units/treasureTrain.png | Bin
.../classic}/resources/images/units/undead.png | Bin
.../classic}/resources/images/units/unit.png | Bin
.../resources/images/units/veteranSoldier.png | Bin
.../classic}/resources/images/units/wagonTrain.png | Bin
data/rules/classic/resources/sound/README | 3 +
data/rules/classic/resources/sound/alert.ogg | Bin 0 -> 19775 bytes
.../rules/classic/resources/sound/anthem/dutch.ogg | Bin 0 -> 119012 bytes
.../classic/resources/sound/anthem/english.ogg | Bin 0 -> 112130 bytes
.../classic/resources/sound/anthem/french.ogg | Bin 0 -> 118470 bytes
.../classic/resources/sound/anthem/spanish.ogg | Bin 0 -> 112320 bytes
.../classic/resources/sound/attack/artillery.ogg} | Bin
.../classic/resources/sound/attack/dragoon.ogg} | Bin
.../rules/classic/resources/sound/attack/naval.ogg | Bin 0 -> 30570 bytes
data/rules/classic/resources/sound/building.ogg | Bin 0 -> 26961 bytes
.../classic/resources/sound/colony.ogg} | Bin
.../classic/resources/sound}/fountain.ogg | Bin
.../classic/resources/sound/intro/generic.ogg} | Bin
data/rules/classic/resources/sound/load.ogg | Bin 0 -> 6353 bytes
data/rules/classic/resources/sound/meet/aztec.ogg | Bin 0 -> 129126 bytes
.../classic/resources/sound/mission.ogg} | Bin
.../classic/resources/sound/sell.ogg} | Bin
data/rules/classic/resources/sound/sunk.ogg | Bin 0 -> 57093 bytes
.../resources/video/freecol-opening.video.ogg | Bin
data/rules/classic/specification.xml | 2271 +++++++
data/rules/freecol/FreeColMessages.properties | 3 +
data/rules/freecol/mod.xml | 1 +
data/rules/freecol/resources.properties | 32 +
.../resources/images/coat-of-arms/danish-ref.png | Bin
.../resources/images/coat-of-arms/danish.png | Bin
.../images/coat-of-arms/portuguese-ref.png | Bin
.../resources/images/coat-of-arms/portuguese.png | Bin
.../resources/images/coat-of-arms/russian-ref.png | Bin
.../resources/images/coat-of-arms/russian.png | Bin
.../resources/images/coat-of-arms/swedish-ref.png | Bin
.../resources/images/coat-of-arms/swedish.png | Bin
.../freecol/resources/images/monarch/charles.png | Bin
.../freecol/resources/images/monarch/frederik.png | Bin
.../freecol/resources/images/monarch/manuel.png | Bin
.../freecol/resources/images/monarch/pierre.png | Bin
.../freecol/resources/sound/intro/generic.ogg} | Bin
data/rules/freecol/specification.xml | 110 +
data/rules/testing/specification.xml | 121 +
data/strings/FreeColMessages.properties | 2310 ++++---
data/strings/FreeColMessages_af.properties | 1433 +++--
data/strings/FreeColMessages_ang.properties | 2118 +++++++
data/strings/FreeColMessages_ar.properties | 4024 ++++++------
data/strings/FreeColMessages_arz.properties | 3940 ++++++------
data/strings/FreeColMessages_be-tarask.properties | 3523 +++++++----
data/strings/FreeColMessages_bg.properties | 1947 +++---
data/strings/FreeColMessages_br.properties | 2801 ++++----
data/strings/FreeColMessages_bs.properties | 1479 +++--
data/strings/FreeColMessages_ca.properties | 2540 +++++---
data/strings/FreeColMessages_cs_CZ.properties | 3516 ++++++-----
data/strings/FreeColMessages_da.properties | 2911 +++++----
data/strings/FreeColMessages_de.properties | 2706 ++++----
data/strings/FreeColMessages_el.properties | 2549 ++++----
data/strings/FreeColMessages_en_GB.properties | 6 +-
data/strings/FreeColMessages_eo.properties | 2249 +++----
data/strings/FreeColMessages_es_ES.properties | 2389 +++----
data/strings/FreeColMessages_et.properties | 575 ++
data/strings/FreeColMessages_eu.properties | 347 +-
data/strings/FreeColMessages_fa.properties | 1037 +--
data/strings/FreeColMessages_fi.properties | 2425 +++----
data/strings/FreeColMessages_fr.properties | 3188 +++++-----
data/strings/FreeColMessages_gl.properties | 2888 +++++----
data/strings/FreeColMessages_grc.properties | 1126 ++--
data/strings/FreeColMessages_he.properties | 1375 ++++
data/strings/FreeColMessages_hsb.properties | 2147 ++++---
data/strings/FreeColMessages_hu.properties | 3589 ++++++-----
data/strings/FreeColMessages_ia.properties | 2151 ++++++-
data/strings/FreeColMessages_id.properties | 600 ++
data/strings/FreeColMessages_it_IT.properties | 2183 ++++---
data/strings/FreeColMessages_ja.properties | 2868 ++++++---
data/strings/FreeColMessages_km.properties | 1978 +++---
data/strings/FreeColMessages_lt.properties | 2107 ++++++
data/strings/FreeColMessages_mk.properties | 5193 +++++++++------
data/strings/FreeColMessages_nb_NO.properties | 1207 ++--
data/strings/FreeColMessages_nds.properties | 1546 +++--
data/strings/FreeColMessages_nl.properties | 1958 +++---
data/strings/FreeColMessages_nl_BE.properties | 1387 ++--
data/strings/FreeColMessages_nn.properties | 1248 ++--
data/strings/FreeColMessages_oc.properties | 2449 ++++---
data/strings/FreeColMessages_pl_PL.properties | 3022 ++++-----
data/strings/FreeColMessages_pms.properties | 1931 +++---
data/strings/FreeColMessages_pt_BR.properties | 2556 ++++----
data/strings/FreeColMessages_pt_PT.properties | 3054 ++++-----
data/strings/FreeColMessages_qqq.properties | 423 ++
data/strings/FreeColMessages_ru.properties | 4359 +++++++------
data/strings/FreeColMessages_sq.properties | 1586 ++---
data/strings/FreeColMessages_sv_SE.properties | 3038 ++++-----
data/strings/FreeColMessages_ta.properties | 1224 ++--
data/strings/FreeColMessages_tl.properties | 1547 +++--
data/strings/FreeColMessages_tr.properties | 992 +--
data/strings/FreeColMessages_uk.properties | 4172 ++++++------
data/strings/FreeColMessages_zh_CN.properties | 3246 ++++++++++
data/strings/Messages.java | 540 --
data/strings/package.html | 98 -
data/strings/plurals.xml | 95 +
data/testing/mod.xml | 1 -
data/testing/specification.xml | 2204 -------
debian/changelog | 64 +-
debian/control | 16 +-
debian/freecol.classpath | 1 +
debian/freecol.install | 6 +
debian/freecol.jlibs | 1 +
debian/install | 7 -
debian/new-upstream | 6 +-
debian/patches/10-fix-jar-path.diff | 10 +-
debian/patches/40-manpage.diff | 8 +-
debian/patches/series | 2 +-
debian/rules | 21 +-
debian/watch | 2 +-
debian/wrapper/freecol | 4 +-
doc/FreeCol.aux | 888 +--
doc/FreeCol.idx | 741 +--
doc/FreeCol.ilg | 10 +-
doc/FreeCol.ind | 741 +--
doc/FreeCol.log | 228 +-
doc/FreeCol.out | 25 +-
doc/FreeCol.pdf | Bin 3229053 -> 3785688 bytes
doc/FreeCol.tex | 749 ++-
doc/FreeCol.toc | 135 +-
doc/developer.tex | 302 +-
doc/images/colony_panel.png | Bin 665048 -> 685777 bytes
doc/images/europe_panel.png | Bin 608290 -> 540405 bytes
doc/images/main_screen.png | Bin 1617701 -> 1956789 bytes
freecol | 2 +-
packaging/common/README | 4 +-
packaging/common/freecol | 2 +-
packaging/debian/freecol.6 | 2 +-
packaging/debian/freecol.sh | 4 +-
packaging/debian/rules | 2 -
packaging/targz/create_src_tar_gz.sh | 4 +-
packaging/targz/create_tar_gz.sh | 4 +-
packaging/targz/create_zip.sh | 4 +-
schema/data/data-aiMain.xsd | 63 +-
schema/data/data-building.xsd | 2 +-
schema/data/data-colony.xsd | 27 +-
schema/data/data-colonyTile.xsd | 2 +-
schema/data/data-common.xsd | 92 +-
schema/data/data-equipment.xsd | 2 +-
schema/data/data-europe.xsd | 2 +-
schema/data/data-exportData.xsd | 2 +-
schema/data/data-game.xsd | 49 +-
schema/data/data-gameOptions.xsd | 66 -
schema/data/data-goods.xsd | 2 +-
schema/data/data-goodsContainer.xsd | 2 +-
schema/data/data-historyEvent.xsd | 31 +-
schema/data/data-indianSettlement.xsd | 53 +-
schema/data/data-lostCityRumour.xsd | 2 +-
schema/data/data-map.xsd | 19 +-
schema/data/data-market.xsd | 5 +-
schema/data/data-modelMessage.xsd | 37 +-
schema/data/data-modifier.xsd | 11 +-
schema/data/data-monarch.xsd | 4 +-
schema/data/data-nationOptions.xsd | 4 +-
schema/data/data-player.xsd | 113 +-
schema/data/data-playerExploredTile.xsd | 28 +-
schema/data/data-region.xsd | 5 +-
schema/data/data-resource.xsd | 2 +-
schema/data/data-savedGame.xsd | 2 +-
schema/data/data-serverObjects.xsd | 16 +-
schema/data/data-specification.xsd | 975 +++
schema/data/data-stringTemplate.xsd | 63 +
schema/data/data-template.xsd | 2 +-
schema/data/data-tile.xsd | 3 +-
schema/data/data-tileimprovement.xsd | 2 +-
schema/data/data-tileitemcontainer.xsd | 2 +-
schema/data/data-tradeRoute.xsd | 8 +-
schema/data/data-unit.xsd | 25 +-
schema/data/data.xsd | 6 +-
schema/specification-schema-0.2.xml | 1196 ----
schema/specification-schema-0.3.xml | 1243 ----
schema/specification-schema-0.4.xml | 1248 ----
schema/specification-schema-0.5.xml | 1246 ----
schema/specification-schema-0.6.xml | 1260 ----
schema/specification-schema.xsd | 878 ++-
src/MANIFEST.MF | 8 +-
src/net/sf/freecol/FreeCol.java | 794 +--
src/net/sf/freecol/client/ClientOptions.java | 458 +-
src/net/sf/freecol/client/FreeColClient.java | 1009 ++-
src/net/sf/freecol/client/Worker.java | 2 +-
.../client/control/ClientModelController.java | 287 -
.../freecol/client/control/ConnectController.java | 285 +-
.../freecol/client/control/InGameController.java | 6676 +++++++++-----------
.../freecol/client/control/InGameInputHandler.java | 2234 ++++---
.../sf/freecol/client/control/InputHandler.java | 16 +-
.../client/control/MapEditorController.java | 218 +-
.../freecol/client/control/PreGameController.java | 187 +-
.../client/control/PreGameInputHandler.java | 110 +-
src/net/sf/freecol/client/gui/Canvas.java | 3319 +++++-----
.../sf/freecol/client/gui/CanvasKeyListener.java | 222 -
.../client/gui/CanvasMapEditorMouseListener.java | 221 +-
.../sf/freecol/client/gui/CanvasMouseListener.java | 112 +-
.../client/gui/CanvasMouseMotionListener.java | 181 +-
src/net/sf/freecol/client/gui/FAFile.java | 260 -
src/net/sf/freecol/client/gui/FreeColMenuBar.java | 257 -
src/net/sf/freecol/client/gui/FreeColMenuTest.java | 155 -
src/net/sf/freecol/client/gui/FullScreenFrame.java | 8 +-
src/net/sf/freecol/client/gui/GUI.java | 3968 +++---------
src/net/sf/freecol/client/gui/GUIMessage.java | 2 +-
src/net/sf/freecol/client/gui/ImageLibrary.java | 1652 ++---
src/net/sf/freecol/client/gui/InGameMenuBar.java | 376 --
.../sf/freecol/client/gui/MapEditorMenuBar.java | 211 -
src/net/sf/freecol/client/gui/MapViewer.java | 3434 ++++++++++
src/net/sf/freecol/client/gui/MessageLabel.java | 2 +-
.../client/gui/OutForAnimationCallback.java | 4 +-
src/net/sf/freecol/client/gui/TerrainCursor.java | 2 +-
src/net/sf/freecol/client/gui/TilePopup.java | 499 +-
src/net/sf/freecol/client/gui/ViewMode.java | 37 +-
src/net/sf/freecol/client/gui/WindowedFrame.java | 7 +-
.../freecol/client/gui/WindowedFrameListener.java | 14 +-
.../sf/freecol/client/gui/action/AboutAction.java | 33 +-
.../freecol/client/gui/action/ActionManager.java | 228 +-
.../client/gui/action/AssignTradeRouteAction.java | 42 +-
.../client/gui/action/BuildColonyAction.java | 46 +-
.../sf/freecol/client/gui/action/CenterAction.java | 52 +
.../sf/freecol/client/gui/action/ChangeAction.java | 92 +-
.../gui/action/ChangeWindowedModeAction.java | 44 +-
.../sf/freecol/client/gui/action/ChatAction.java | 44 +-
.../client/gui/action/ClearOrdersAction.java | 41 +-
.../freecol/client/gui/action/ColopediaAction.java | 75 +
.../client/gui/action/ColopediaBuildingAction.java | 77 -
.../client/gui/action/ColopediaFatherAction.java | 77 -
.../client/gui/action/ColopediaGoodsAction.java | 77 -
.../client/gui/action/ColopediaNationAction.java | 78 -
.../gui/action/ColopediaNationTypeAction.java | 78 -
.../client/gui/action/ColopediaResourceAction.java | 76 -
.../client/gui/action/ColopediaSkillAction.java | 77 -
.../client/gui/action/ColopediaTerrainAction.java | 77 -
.../client/gui/action/ColopediaUnitAction.java | 77 -
.../freecol/client/gui/action/ContinueAction.java | 64 +
.../sf/freecol/client/gui/action/DebugAction.java | 70 +
.../client/gui/action/DebugCrossBugAction.java | 84 -
.../gui/action/DebugShowCoordinatesAction.java | 79 -
.../gui/action/DeclareIndependenceAction.java | 30 +-
.../client/gui/action/DetermineHighSeasAction.java | 83 +-
.../client/gui/action/DisbandUnitAction.java | 50 +-
.../client/gui/action/DisplayBordersAction.java | 45 +-
.../client/gui/action/DisplayGridAction.java | 47 +-
.../client/gui/action/DisplayTileEmptyAction.java | 86 -
.../client/gui/action/DisplayTileNamesAction.java | 86 -
.../client/gui/action/DisplayTileOwnersAction.java | 86 -
.../gui/action/DisplayTileRegionsAction.java | 86 -
.../client/gui/action/DisplayTileTextAction.java | 100 +
.../freecol/client/gui/action/EndTurnAction.java | 30 +-
.../sf/freecol/client/gui/action/EuropeAction.java | 39 +-
.../client/gui/action/ExecuteGotoOrdersAction.java | 35 +-
.../client/gui/action/FindSettlementAction.java | 46 +-
.../freecol/client/gui/action/FortifyAction.java | 57 +-
.../freecol/client/gui/action/FreeColAction.java | 319 +-
.../sf/freecol/client/gui/action/GotoAction.java | 39 +-
.../freecol/client/gui/action/GotoTileAction.java | 89 +-
.../client/gui/action/ImprovementAction.java | 126 +-
.../client/gui/action/ImprovementActionType.java | 92 -
.../sf/freecol/client/gui/action/LoadAction.java | 43 +-
.../client/gui/action/MapControlsAction.java | 53 +-
.../freecol/client/gui/action/MapEditorAction.java | 54 +
.../freecol/client/gui/action/MapboardAction.java | 38 +-
.../gui/action/MiniMapChangeBackgroundAction.java | 141 -
.../client/gui/action/MiniMapZoomInAction.java | 60 +-
.../client/gui/action/MiniMapZoomOutAction.java | 60 +-
.../sf/freecol/client/gui/action/MoveAction.java | 76 +
.../sf/freecol/client/gui/action/NewAction.java | 45 +-
.../client/gui/action/NewEmptyMapAction.java | 46 +-
.../sf/freecol/client/gui/action/OpenAction.java | 43 +-
.../client/gui/action/PreferencesAction.java | 50 +-
.../sf/freecol/client/gui/action/QuitAction.java | 40 +-
.../freecol/client/gui/action/ReconnectAction.java | 50 +-
.../sf/freecol/client/gui/action/RenameAction.java | 40 +-
.../client/gui/action/ReportCargoAction.java | 42 +-
.../client/gui/action/ReportColonyAction.java | 42 +-
.../action/ReportContinentalCongressAction.java | 42 +-
.../client/gui/action/ReportEducationAction.java | 53 +
.../client/gui/action/ReportExplorationAction.java | 42 +-
.../client/gui/action/ReportForeignAction.java | 46 +-
.../client/gui/action/ReportHighScoresAction.java | 39 +-
.../client/gui/action/ReportHistoryAction.java | 40 +-
.../client/gui/action/ReportIndianAction.java | 42 +-
.../client/gui/action/ReportLabourAction.java | 45 +-
.../client/gui/action/ReportMilitaryAction.java | 42 +-
.../client/gui/action/ReportNavalAction.java | 42 +-
.../client/gui/action/ReportProductionAction.java | 43 +-
.../client/gui/action/ReportReligionAction.java | 42 +-
.../gui/action/ReportRequirementsAction.java | 42 +-
.../client/gui/action/ReportTradeAction.java | 42 +-
.../client/gui/action/ReportTurnAction.java | 38 +-
.../sf/freecol/client/gui/action/RetireAction.java | 39 +-
.../sf/freecol/client/gui/action/SaveAction.java | 37 +-
.../client/gui/action/SaveAndQuitAction.java | 62 +-
.../freecol/client/gui/action/ScaleMapAction.java | 112 +-
.../client/gui/action/SelectableAction.java | 91 +-
.../sf/freecol/client/gui/action/SentryAction.java | 60 +-
.../client/gui/action/ShowDifficultyAction.java | 52 +
.../client/gui/action/ShowGameOptionsAction.java | 52 +
.../freecol/client/gui/action/ShowMainAction.java | 47 +-
.../gui/action/ShowMapGeneratorOptionsAction.java | 54 +
.../freecol/client/gui/action/SkipUnitAction.java | 53 +-
.../freecol/client/gui/action/TilePopupAction.java | 52 +
.../client/gui/action/ToggleViewModeAction.java | 39 +-
.../client/gui/action/TradeRouteAction.java | 40 +-
.../sf/freecol/client/gui/action/UnitAction.java | 50 +
.../sf/freecol/client/gui/action/UnloadAction.java | 108 +-
.../sf/freecol/client/gui/action/WaitAction.java | 43 +-
.../sf/freecol/client/gui/action/ZoomInAction.java | 48 +-
.../freecol/client/gui/action/ZoomOutAction.java | 50 +-
src/net/sf/freecol/client/gui/action/package.html | 14 +
.../freecol/client/gui/animation/Animations.java | 92 +-
.../client/gui/animation/UnitAttackAnimation.java | 111 +
.../client/gui/animation/UnitImageAnimation.java | 39 +-
.../client/gui/animation/UnitMoveAnimation.java | 135 +-
.../freecol/client/gui/i18n/DefaultNumberRule.java | 87 +
.../sf/freecol/client/gui/i18n/DualNumberRule.java | 42 +
.../client/gui/i18n/FreeColMessages.properties | 3295 ----------
.../client/gui/i18n/FreeColMessages_af.properties | 1962 ------
.../client/gui/i18n/FreeColMessages_ar.properties | 2034 ------
.../client/gui/i18n/FreeColMessages_arz.properties | 2033 ------
.../gui/i18n/FreeColMessages_be-tarask.properties | 1226 ----
.../client/gui/i18n/FreeColMessages_bg.properties | 994 ---
.../client/gui/i18n/FreeColMessages_br.properties | 1971 ------
.../client/gui/i18n/FreeColMessages_bs.properties | 1159 ----
.../client/gui/i18n/FreeColMessages_ca.properties | 1212 ----
.../gui/i18n/FreeColMessages_cs_CZ.properties | 1942 ------
.../client/gui/i18n/FreeColMessages_da.properties | 2010 ------
.../client/gui/i18n/FreeColMessages_de.properties | 1979 ------
.../client/gui/i18n/FreeColMessages_el.properties | 1175 ----
.../gui/i18n/FreeColMessages_en_GB.properties | 11 -
.../client/gui/i18n/FreeColMessages_eo.properties | 1950 ------
.../gui/i18n/FreeColMessages_es_ES.properties | 1925 ------
.../client/gui/i18n/FreeColMessages_eu.properties | 679 --
.../client/gui/i18n/FreeColMessages_fa.properties | 425 --
.../client/gui/i18n/FreeColMessages_fi.properties | 1739 -----
.../client/gui/i18n/FreeColMessages_fr.properties | 1990 ------
.../client/gui/i18n/FreeColMessages_gl.properties | 1945 ------
.../client/gui/i18n/FreeColMessages_grc.properties | 576 --
.../client/gui/i18n/FreeColMessages_hsb.properties | 1201 ----
.../client/gui/i18n/FreeColMessages_hu.properties | 2010 ------
.../client/gui/i18n/FreeColMessages_ia.properties | 818 ---
.../gui/i18n/FreeColMessages_it_IT.properties | 1978 ------
.../client/gui/i18n/FreeColMessages_ja.properties | 842 ---
.../client/gui/i18n/FreeColMessages_km.properties | 951 ---
.../client/gui/i18n/FreeColMessages_mk.properties | 1920 ------
.../gui/i18n/FreeColMessages_nb_NO.properties | 1167 ----
.../client/gui/i18n/FreeColMessages_nds.properties | 1341 ----
.../client/gui/i18n/FreeColMessages_nl.properties | 2007 ------
.../gui/i18n/FreeColMessages_nl_BE.properties | 2086 ------
.../client/gui/i18n/FreeColMessages_nn.properties | 1121 ----
.../client/gui/i18n/FreeColMessages_oc.properties | 2014 ------
.../gui/i18n/FreeColMessages_pl_PL.properties | 2009 ------
.../client/gui/i18n/FreeColMessages_pms.properties | 1317 ----
.../gui/i18n/FreeColMessages_pt_BR.properties | 1930 ------
.../gui/i18n/FreeColMessages_pt_PT.properties | 1974 ------
.../client/gui/i18n/FreeColMessages_ru.properties | 2023 ------
.../client/gui/i18n/FreeColMessages_sq.properties | 1000 ---
.../gui/i18n/FreeColMessages_sv_SE.properties | 2027 ------
.../client/gui/i18n/FreeColMessages_ta.properties | 480 --
.../client/gui/i18n/FreeColMessages_tl.properties | 1836 ------
.../client/gui/i18n/FreeColMessages_tr.properties | 622 --
.../client/gui/i18n/FreeColMessages_uk.properties | 2137 -------
src/net/sf/freecol/client/gui/i18n/Messages.java | 918 ++-
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 +
.../freecol/client/gui/i18n/ZeroOneNumberRule.java | 36 +
src/net/sf/freecol/client/gui/menu/DebugMenu.java | 870 ++-
.../sf/freecol/client/gui/menu/FreeColMenuBar.java | 250 +
.../freecol/client/gui/menu/FreeColMenuTest.java | 150 +
.../sf/freecol/client/gui/menu/InGameMenuBar.java | 279 +
.../freecol/client/gui/menu/MapEditorMenuBar.java | 172 +
src/net/sf/freecol/client/gui/menu/package.html | 8 +
.../client/gui/option/AbstractUnitOptionUI.java | 227 +
.../client/gui/option/AudioMixerOptionUI.java | 170 +-
.../freecol/client/gui/option/BooleanOptionUI.java | 118 +-
.../sf/freecol/client/gui/option/FileOptionUI.java | 148 +-
.../freecol/client/gui/option/FreeColActionUI.java | 119 +-
.../freecol/client/gui/option/IntegerOptionUI.java | 131 +-
.../client/gui/option/LanguageOptionUI.java | 106 +-
.../sf/freecol/client/gui/option/ListOptionUI.java | 347 +-
.../sf/freecol/client/gui/option/ModOptionUI.java | 113 +
.../freecol/client/gui/option/OptionGroupUI.java | 417 +-
.../sf/freecol/client/gui/option/OptionMapUI.java | 232 -
src/net/sf/freecol/client/gui/option/OptionUI.java | 214 +
.../freecol/client/gui/option/OptionUpdater.java | 20 +-
.../client/gui/option/PercentageOptionUI.java | 117 +-
.../freecol/client/gui/option/RangeOptionUI.java | 130 +-
.../freecol/client/gui/option/SelectOptionUI.java | 122 +-
.../freecol/client/gui/option/SliderOptionUI.java | 94 +
.../freecol/client/gui/option/StringOptionUI.java | 93 +
.../client/gui/option/UnitTypeOptionUI.java | 95 +
src/net/sf/freecol/client/gui/package.html | 2 +-
.../sf/freecol/client/gui/panel/AboutPanel.java | 120 +-
.../client/gui/panel/AbstractGoodsLabel.java | 123 +
.../client/gui/panel/AdvantageCellEditor.java | 11 +-
.../client/gui/panel/AdvantageCellRenderer.java | 17 +-
.../freecol/client/gui/panel/BuildQueuePanel.java | 455 +-
.../client/gui/panel/BuildingDetailPanel.java | 273 +
.../sf/freecol/client/gui/panel/BuildingPanel.java | 136 +-
.../client/gui/panel/BuildingSitePanel.java | 166 -
.../client/gui/panel/BuildingSiteToolTip.java | 113 -
.../freecol/client/gui/panel/BuildingToolTip.java | 116 +-
.../client/gui/panel/CaptureGoodsDialog.java | 237 +-
.../sf/freecol/client/gui/panel/CargoPanel.java | 150 +-
src/net/sf/freecol/client/gui/panel/ChatPanel.java | 16 +-
.../sf/freecol/client/gui/panel/ChoiceDialog.java | 148 +
.../sf/freecol/client/gui/panel/ChoiceItem.java | 22 +-
.../gui/panel/ChooseFoundingFatherDialog.java | 203 +-
.../client/gui/panel/ClassicMapControls.java | 120 +
.../client/gui/panel/ClientOptionsDialog.java | 166 +-
.../sf/freecol/client/gui/panel/ColonyPanel.java | 1726 ++---
.../client/gui/panel/ColopediaDetailPanel.java | 48 +
.../gui/panel/ColopediaGameObjectTypePanel.java | 292 +
.../freecol/client/gui/panel/ColopediaPanel.java | 1417 +----
.../gui/panel/ColopediaTreeCellRenderer.java | 33 +-
.../client/gui/panel/ColopediaTreeItem.java | 58 +-
.../freecol/client/gui/panel/ColorCellEditor.java | 17 +-
.../client/gui/panel/ColorCellRenderer.java | 9 +-
.../client/gui/panel/CompactLabourReport.java | 516 +-
.../client/gui/panel/ConceptDetailPanel.java | 150 +
.../client/gui/panel/ConfirmDeclarationDialog.java | 87 +-
.../client/gui/panel/ConstructionPanel.java | 185 +
.../client/gui/panel/CornerMapControls.java | 151 +
.../client/gui/panel/DeclarationDialog.java | 39 +-
.../client/gui/panel/DefaultTransferHandler.java | 138 +-
.../freecol/client/gui/panel/DifficultyDialog.java | 198 +
.../sf/freecol/client/gui/panel/DragListener.java | 346 +-
.../sf/freecol/client/gui/panel/DropListener.java | 2 +-
.../freecol/client/gui/panel/DumpCargoDialog.java | 42 +-
.../client/gui/panel/EditSettlementDialog.java | 139 +-
.../freecol/client/gui/panel/EmigrationPanel.java | 19 +-
.../sf/freecol/client/gui/panel/EndTurnDialog.java | 240 +
.../sf/freecol/client/gui/panel/ErrorPanel.java | 152 +-
.../sf/freecol/client/gui/panel/EuropePanel.java | 1015 ++-
.../sf/freecol/client/gui/panel/EventPanel.java | 106 +-
.../client/gui/panel/FatherDetailPanel.java | 162 +
src/net/sf/freecol/client/gui/panel/FileList.java | 2 +-
.../client/gui/panel/FindSettlementDialog.java | 55 +-
.../sf/freecol/client/gui/panel/FreeColDialog.java | 604 +-
.../client/gui/panel/FreeColImageBorder.java | 2 +-
.../sf/freecol/client/gui/panel/FreeColPanel.java | 659 +-
.../client/gui/panel/FreeColProgressBar.java | 75 +-
.../client/gui/panel/GameOptionsDialog.java | 198 +-
.../freecol/client/gui/panel/GoodsDetailPanel.java | 234 +
.../sf/freecol/client/gui/panel/GoodsLabel.java | 143 +-
.../sf/freecol/client/gui/panel/ImageProvider.java | 166 -
.../freecol/client/gui/panel/ImageSelection.java | 2 +-
.../client/gui/panel/IndianSettlementPanel.java | 117 +-
src/net/sf/freecol/client/gui/panel/InfoPanel.java | 294 +-
.../client/gui/panel/InformationDialog.java | 58 +-
.../sf/freecol/client/gui/panel/LabourData.java | 26 +-
.../client/gui/panel/LoadingSavegameDialog.java | 67 +-
src/net/sf/freecol/client/gui/panel/MainPanel.java | 143 +-
.../sf/freecol/client/gui/panel/MapControls.java | 220 +-
.../client/gui/panel/MapEditorTransformPanel.java | 93 +-
.../gui/panel/MapGeneratorOptionsDialog.java | 261 +-
.../sf/freecol/client/gui/panel/MarketLabel.java | 168 +-
src/net/sf/freecol/client/gui/panel/MiniMap.java | 593 +-
.../sf/freecol/client/gui/panel/MonarchPanel.java | 140 +-
.../freecol/client/gui/panel/NationCellEditor.java | 5 +-
.../client/gui/panel/NationCellRenderer.java | 6 +-
.../client/gui/panel/NationDetailPanel.java | 107 +
.../client/gui/panel/NationTypeDetailPanel.java | 214 +
.../client/gui/panel/NegotiationDialog.java | 217 +-
src/net/sf/freecol/client/gui/panel/NewPanel.java | 331 +-
.../sf/freecol/client/gui/panel/OptionsDialog.java | 284 +
.../sf/freecol/client/gui/panel/PlayersTable.java | 85 +-
.../freecol/client/gui/panel/PreCombatDialog.java | 127 +-
.../freecol/client/gui/panel/ProductionLabel.java | 175 +-
.../client/gui/panel/ProductionMultiplesLabel.java | 521 --
.../sf/freecol/client/gui/panel/RebelToolTip.java | 45 +-
.../sf/freecol/client/gui/panel/RecruitDialog.java | 84 +-
.../freecol/client/gui/panel/ReportCargoPanel.java | 58 +-
.../client/gui/panel/ReportColonyPanel.java | 906 ++-
.../gui/panel/ReportContinentalCongressPanel.java | 118 +-
.../client/gui/panel/ReportEducationPanel.java | 90 +
.../client/gui/panel/ReportExplorationPanel.java | 23 +-
.../client/gui/panel/ReportForeignAffairPanel.java | 73 +-
.../client/gui/panel/ReportHighScoresPanel.java | 151 +-
.../client/gui/panel/ReportHistoryPanel.java | 20 +-
.../client/gui/panel/ReportIndianPanel.java | 205 +-
.../client/gui/panel/ReportLabourDetailPanel.java | 10 +-
.../client/gui/panel/ReportLabourPanel.java | 171 +-
.../client/gui/panel/ReportMilitaryPanel.java | 78 +-
.../freecol/client/gui/panel/ReportNavalPanel.java | 98 +-
.../sf/freecol/client/gui/panel/ReportPanel.java | 143 +-
.../client/gui/panel/ReportProductionPanel.java | 46 +-
.../client/gui/panel/ReportReligiousPanel.java | 43 +-
.../client/gui/panel/ReportRequirementsPanel.java | 412 +-
.../freecol/client/gui/panel/ReportTradePanel.java | 225 +-
.../freecol/client/gui/panel/ReportTurnPanel.java | 156 +-
.../client/gui/panel/ResourcesDetailPanel.java | 122 +
.../freecol/client/gui/panel/RiverStylePanel.java | 19 +-
.../client/gui/panel/SelectAmountDialog.java | 71 +-
.../client/gui/panel/SelectDestinationDialog.java | 245 +-
.../freecol/client/gui/panel/ServerListPanel.java | 18 +-
.../freecol/client/gui/panel/StartGamePanel.java | 112 +-
.../freecol/client/gui/panel/StatisticsPanel.java | 80 +-
.../sf/freecol/client/gui/panel/StatusPanel.java | 10 +-
.../client/gui/panel/TerrainDetailPanel.java | 149 +
src/net/sf/freecol/client/gui/panel/TilePanel.java | 57 +-
.../freecol/client/gui/panel/TradeRouteDialog.java | 146 +-
.../client/gui/panel/TradeRouteInputDialog.java | 390 +-
.../sf/freecol/client/gui/panel/TrainDialog.java | 58 +-
.../sf/freecol/client/gui/panel/UnitButton.java | 47 +-
.../freecol/client/gui/panel/UnitDetailPanel.java | 243 +
src/net/sf/freecol/client/gui/panel/UnitLabel.java | 300 +-
.../sf/freecol/client/gui/panel/VictoryPanel.java | 46 +-
.../freecol/client/gui/panel/WarehouseDialog.java | 93 +-
.../client/gui/panel/WorkProductionPanel.java | 199 +-
.../client/gui/plaf/FreeColBrightPanelUI.java | 34 +-
.../freecol/client/gui/plaf/FreeColButtonUI.java | 68 +-
.../freecol/client/gui/plaf/FreeColCheckBoxUI.java | 10 +-
.../client/gui/plaf/FreeColComboBoxRenderer.java | 46 +-
.../freecol/client/gui/plaf/FreeColComboBoxUI.java | 13 +-
.../sf/freecol/client/gui/plaf/FreeColLabelUI.java | 2 +-
.../sf/freecol/client/gui/plaf/FreeColListUI.java | 30 +-
.../client/gui/plaf/FreeColLookAndFeel.java | 391 +-
.../freecol/client/gui/plaf/FreeColMenuBarUI.java | 30 +-
.../freecol/client/gui/plaf/FreeColMenuItemUI.java | 8 +-
.../sf/freecol/client/gui/plaf/FreeColPanelUI.java | 34 +-
.../client/gui/plaf/FreeColPopupMenuUI.java | 32 +-
.../client/gui/plaf/FreeColRadioButtonUI.java | 10 +-
.../client/gui/plaf/FreeColScrollPaneUI.java | 6 +-
.../client/gui/plaf/FreeColSelectedPanelUI.java | 58 +
.../client/gui/plaf/FreeColTableHeaderUI.java | 6 +-
.../sf/freecol/client/gui/plaf/FreeColTableUI.java | 10 +-
.../freecol/client/gui/plaf/FreeColTextAreaUI.java | 37 +-
.../client/gui/plaf/FreeColTextFieldUI.java | 35 +-
.../freecol/client/gui/plaf/FreeColToolTipUI.java | 139 +-
.../client/gui/plaf/FreeColTransparentPanelUI.java | 16 +-
.../sf/freecol/client/gui/plaf/LAFUtilities.java | 10 +-
.../sf/freecol/client/gui/sound/MusicLibrary.java | 49 -
src/net/sf/freecol/client/gui/sound/Playlist.java | 2 +-
.../sf/freecol/client/gui/sound/SfxLibrary.java | 44 -
.../sf/freecol/client/gui/sound/SoundLibrary.java | 117 -
.../sf/freecol/client/gui/sound/SoundPlayer.java | 558 +-
src/net/sf/freecol/client/gui/video/Video.java | 43 -
.../freecol/client/gui/video/VideoComponent.java | 63 +-
.../sf/freecol/client/gui/video/VideoListener.java | 2 +-
src/net/sf/freecol/client/networking/Client.java | 175 +-
src/net/sf/freecol/common/FreeColException.java | 2 +-
src/net/sf/freecol/common/PseudoRandom.java | 54 -
src/net/sf/freecol/common/ServerInfo.java | 2 +-
src/net/sf/freecol/common/Specification.java | 1090 ----
src/net/sf/freecol/common/io/FreeColDataFile.java | 195 +-
src/net/sf/freecol/common/io/FreeColModFile.java | 160 +-
.../sf/freecol/common/io/FreeColSavegameFile.java | 45 +-
src/net/sf/freecol/common/io/FreeColTcFile.java | 92 +-
src/net/sf/freecol/common/io/Mods.java | 133 +-
.../sf/freecol/common/logging/DefaultHandler.java | 13 +-
.../sf/freecol/common/logging/TextFormatter.java | 7 +-
src/net/sf/freecol/common/model/Ability.java | 234 +-
src/net/sf/freecol/common/model/AbstractGoods.java | 68 +-
src/net/sf/freecol/common/model/AbstractUnit.java | 107 +-
src/net/sf/freecol/common/model/BuildQueue.java | 261 +
src/net/sf/freecol/common/model/BuildableType.java | 157 +-
src/net/sf/freecol/common/model/Building.java | 1172 ++--
src/net/sf/freecol/common/model/BuildingType.java | 340 +-
src/net/sf/freecol/common/model/Colony.java | 2939 +++++----
src/net/sf/freecol/common/model/ColonyTile.java | 765 +--
.../sf/freecol/common/model/ColonyTradeItem.java | 132 +-
src/net/sf/freecol/common/model/ColonyWas.java | 79 +
src/net/sf/freecol/common/model/CombatModel.java | 283 +-
src/net/sf/freecol/common/model/Consumer.java | 106 +
.../sf/freecol/common/model/DifficultyLevel.java | 97 -
.../sf/freecol/common/model/DiplomaticTrade.java | 269 +-
src/net/sf/freecol/common/model/EquipmentType.java | 255 +-
src/net/sf/freecol/common/model/Europe.java | 512 +-
src/net/sf/freecol/common/model/EuropeWas.java | 53 +
.../freecol/common/model/EuropeanNationType.java | 225 +-
src/net/sf/freecol/common/model/Event.java | 205 +
src/net/sf/freecol/common/model/ExportData.java | 53 +-
src/net/sf/freecol/common/model/Feature.java | 136 +-
.../sf/freecol/common/model/FeatureContainer.java | 131 +-
src/net/sf/freecol/common/model/Features.java | 51 -
.../sf/freecol/common/model/FoundingFather.java | 300 +-
.../sf/freecol/common/model/FreeColGameObject.java | 512 +-
.../common/model/FreeColGameObjectListener.java | 2 +-
.../common/model/FreeColGameObjectType.java | 240 +-
src/net/sf/freecol/common/model/FreeColObject.java | 584 +-
src/net/sf/freecol/common/model/Game.java | 709 ++-
src/net/sf/freecol/common/model/GameOptions.java | 137 +-
src/net/sf/freecol/common/model/GoldTradeItem.java | 94 +-
src/net/sf/freecol/common/model/Goods.java | 232 +-
.../sf/freecol/common/model/GoodsContainer.java | 281 +-
src/net/sf/freecol/common/model/GoodsLocation.java | 320 +
.../sf/freecol/common/model/GoodsTradeItem.java | 125 +-
src/net/sf/freecol/common/model/GoodsType.java | 171 +-
src/net/sf/freecol/common/model/HighScore.java | 93 +-
src/net/sf/freecol/common/model/HighSeas.java | 180 +
src/net/sf/freecol/common/model/HistoryEvent.java | 202 +-
.../sf/freecol/common/model/IndianNationType.java | 273 +-
.../sf/freecol/common/model/IndianSettlement.java | 1824 +++---
src/net/sf/freecol/common/model/LastSale.java | 160 +
src/net/sf/freecol/common/model/Limit.java | 352 ++
src/net/sf/freecol/common/model/Locatable.java | 10 +-
src/net/sf/freecol/common/model/Location.java | 57 +-
.../sf/freecol/common/model/LostCityRumour.java | 189 +-
src/net/sf/freecol/common/model/Map.java | 2028 +++---
src/net/sf/freecol/common/model/Market.java | 528 +-
src/net/sf/freecol/common/model/MarketData.java | 233 +-
.../sf/freecol/common/model/ModelController.java | 116 +-
src/net/sf/freecol/common/model/ModelMessage.java | 633 +-
src/net/sf/freecol/common/model/Modifier.java | 205 +-
src/net/sf/freecol/common/model/Monarch.java | 819 +--
src/net/sf/freecol/common/model/Movable.java | 47 +
src/net/sf/freecol/common/model/Nameable.java | 10 +-
src/net/sf/freecol/common/model/Named.java | 19 +-
src/net/sf/freecol/common/model/Nation.java | 167 +-
src/net/sf/freecol/common/model/NationOptions.java | 163 +-
src/net/sf/freecol/common/model/NationSummary.java | 247 +
src/net/sf/freecol/common/model/NationType.java | 222 +-
src/net/sf/freecol/common/model/Operand.java | 391 ++
src/net/sf/freecol/common/model/Ownable.java | 4 +-
src/net/sf/freecol/common/model/PathNode.java | 297 +-
src/net/sf/freecol/common/model/Player.java | 3153 +++++----
.../freecol/common/model/PlayerExploredTile.java | 353 +-
.../sf/freecol/common/model/ProductionCache.java | 221 +
.../sf/freecol/common/model/ProductionInfo.java | 210 +
src/net/sf/freecol/common/model/ProductionMap.java | 223 +
src/net/sf/freecol/common/model/RandomRange.java | 246 +
src/net/sf/freecol/common/model/Region.java | 102 +-
src/net/sf/freecol/common/model/Resource.java | 79 +-
src/net/sf/freecol/common/model/ResourceType.java | 95 +-
src/net/sf/freecol/common/model/Scope.java | 115 +-
src/net/sf/freecol/common/model/Settlement.java | 688 +-
.../sf/freecol/common/model/SettlementType.java | 439 ++
.../sf/freecol/common/model/SimpleCombatModel.java | 1847 ++----
src/net/sf/freecol/common/model/Specification.java | 1265 ++++
.../sf/freecol/common/model/StanceTradeItem.java | 96 +-
.../sf/freecol/common/model/StringTemplate.java | 573 ++
src/net/sf/freecol/common/model/Tension.java | 83 +-
src/net/sf/freecol/common/model/Tile.java | 1691 ++---
.../sf/freecol/common/model/TileImprovement.java | 159 +-
.../freecol/common/model/TileImprovementType.java | 386 +-
src/net/sf/freecol/common/model/TileItem.java | 37 +-
.../sf/freecol/common/model/TileItemContainer.java | 263 +-
src/net/sf/freecol/common/model/TileType.java | 447 +-
.../sf/freecol/common/model/TileTypeChange.java | 154 +
src/net/sf/freecol/common/model/TradeItem.java | 138 +-
src/net/sf/freecol/common/model/TradeRoute.java | 231 +-
.../sf/freecol/common/model/TradeRouteStop.java | 4 +-
.../freecol/common/model/TransactionListener.java | 2 +-
src/net/sf/freecol/common/model/Turn.java | 270 +-
src/net/sf/freecol/common/model/TypeCountMap.java | 26 +-
src/net/sf/freecol/common/model/Typed.java | 41 -
src/net/sf/freecol/common/model/Unit.java | 3893 +++++-------
src/net/sf/freecol/common/model/UnitLocation.java | 447 ++
src/net/sf/freecol/common/model/UnitTradeItem.java | 96 +-
src/net/sf/freecol/common/model/UnitType.java | 531 +-
.../sf/freecol/common/model/UnitTypeChange.java | 182 +-
src/net/sf/freecol/common/model/UnitWas.java | 216 +
src/net/sf/freecol/common/model/WorkLocation.java | 274 +-
.../common/model/mission/AbstractMission.java | 211 +
.../common/model/mission/CompoundMission.java | 208 +
.../freecol/common/model/mission/GoToMission.java | 190 +
.../common/model/mission/ImprovementMission.java | 178 +
.../sf/freecol/common/model/mission/Mission.java | 95 +
.../common/model/mission/MissionManager.java | 96 +
src/net/sf/freecol/common/model/package.html | 36 +-
.../pathfinding/AvoidBlockingUnitsCostDecider.java | 71 -
.../common/model/pathfinding/BaseCostDecider.java | 67 +-
.../common/model/pathfinding/CostDecider.java | 11 +-
.../common/model/pathfinding/CostDeciders.java | 237 +-
.../common/model/pathfinding/GoalDecider.java | 11 +-
.../common/networking/AbandonColonyMessage.java | 119 +
.../freecol/common/networking/AskSkillMessage.java | 138 +
.../common/networking/AssignTeacherMessage.java | 143 +
.../common/networking/AssignTradeRouteMessage.java | 130 +
.../freecol/common/networking/AttackMessage.java | 147 +
.../common/networking/BuildColonyMessage.java | 84 +-
.../freecol/common/networking/BuyGoodsMessage.java | 150 +
.../sf/freecol/common/networking/BuyMessage.java | 80 +-
.../common/networking/BuyPropositionMessage.java | 69 +-
.../networking/CashInTreasureTrainMessage.java | 52 +-
.../common/networking/ChangeStateMessage.java | 129 +
.../ChangeWorkImprovementTypeMessage.java | 154 +
.../common/networking/ChangeWorkTypeMessage.java | 125 +
.../sf/freecol/common/networking/ChatMessage.java | 21 +-
.../networking/ChooseFoundingFatherMessage.java | 145 +
.../common/networking/ClaimLandMessage.java | 70 +-
.../common/networking/ClearSpecialityMessage.java | 107 +
.../common/networking/CloseTransactionMessage.java | 45 +-
.../sf/freecol/common/networking/Connection.java | 179 +-
.../sf/freecol/common/networking/DOMMessage.java | 442 ++
.../networking/DebugForeignColonyMessage.java | 129 -
.../networking/DeclareIndependenceMessage.java | 75 +-
.../common/networking/DeclineMoundsMessage.java | 134 +
.../common/networking/DeliverGiftMessage.java | 96 +-
.../common/networking/DemandTributeMessage.java | 145 +
.../common/networking/DiplomacyMessage.java | 517 +-
.../common/networking/DisbandUnitMessage.java | 107 +
.../common/networking/DisembarkMessage.java | 44 +-
.../freecol/common/networking/EmbarkMessage.java | 189 +
.../common/networking/EmigrateUnitMessage.java | 92 +-
.../common/networking/EquipUnitMessage.java | 160 +
.../common/networking/GetNationSummaryMessage.java | 137 +
.../common/networking/GetTransactionMessage.java | 45 +-
.../common/networking/GiveIndependenceMessage.java | 142 -
.../common/networking/GoodsForSaleMessage.java | 49 +-
.../freecol/common/networking/InciteMessage.java | 178 +
.../common/networking/IndianDemandMessage.java | 237 +
.../common/networking/JoinColonyMessage.java | 43 +-
.../common/networking/LearnSkillMessage.java | 141 +
.../common/networking/LoadCargoMessage.java | 118 +
.../common/networking/LootCargoMessage.java | 172 +
src/net/sf/freecol/common/networking/Message.java | 22 +-
.../freecol/common/networking/MessageHandler.java | 2 +-
.../common/networking/MissionaryMessage.java | 164 +
.../common/networking/MonarchActionMessage.java | 183 +
.../sf/freecol/common/networking/MoveMessage.java | 137 +
.../freecol/common/networking/MoveToMessage.java | 125 +
.../common/networking/NetworkConstants.java | 20 +-
.../common/networking/NetworkReplyObject.java | 24 +-
.../common/networking/NewLandNameMessage.java | 253 +
.../common/networking/NewRegionNameMessage.java | 169 +
.../networking/NoRouteToServerException.java | 2 +-
.../common/networking/PayArrearsMessage.java | 102 +
.../common/networking/PayForBuildingMessage.java | 111 +
.../common/networking/PutOutsideColonyMessage.java | 114 +
.../freecol/common/networking/ReceivingThread.java | 40 +-
.../freecol/common/networking/RenameMessage.java | 31 +-
.../networking/ScoutIndianSettlementMessage.java | 138 +
.../common/networking/SellGoodsMessage.java | 155 +
.../sf/freecol/common/networking/SellMessage.java | 78 +-
.../common/networking/SellPropositionMessage.java | 65 +-
.../sf/freecol/common/networking/ServerAPI.java | 1167 ++++
.../common/networking/SetBuildQueueMessage.java | 160 +
.../common/networking/SetDestinationMessage.java | 28 +-
.../common/networking/SetGoodsLevelsMessage.java | 124 +
.../common/networking/SetTradeRoutesMessage.java | 181 +
.../common/networking/SpySettlementMessage.java | 64 +-
.../common/networking/StatisticsMessage.java | 136 -
.../common/networking/StreamedMessageHandler.java | 2 +-
.../networking/TrainUnitInEuropeMessage.java | 105 +
.../common/networking/UnloadCargoMessage.java | 113 +
.../networking/UpdateCurrentStopMessage.java | 22 +-
.../common/networking/UpdateTradeRouteMessage.java | 115 +
.../sf/freecol/common/networking/WorkMessage.java | 147 +
.../sf/freecol/common/option/AbstractOption.java | 231 +-
.../freecol/common/option/AbstractUnitOption.java | 260 +
.../sf/freecol/common/option/AudioMixerOption.java | 159 +-
.../sf/freecol/common/option/BooleanOption.java | 105 +-
src/net/sf/freecol/common/option/FileOption.java | 94 +-
.../sf/freecol/common/option/IntegerOption.java | 211 +-
.../sf/freecol/common/option/LanguageOption.java | 203 +-
src/net/sf/freecol/common/option/ListOption.java | 222 +-
.../freecol/common/option/ListOptionSelector.java | 48 -
.../freecol/common/option/MapGeneratorOptions.java | 140 +
.../sf/freecol/common/option/ModListOption.java | 67 +
src/net/sf/freecol/common/option/ModOption.java | 208 +
src/net/sf/freecol/common/option/Option.java | 80 +-
src/net/sf/freecol/common/option/OptionGroup.java | 313 +-
src/net/sf/freecol/common/option/OptionMap.java | 408 --
.../sf/freecol/common/option/PercentageOption.java | 83 +-
src/net/sf/freecol/common/option/RangeOption.java | 60 +-
src/net/sf/freecol/common/option/SelectOption.java | 168 +-
src/net/sf/freecol/common/option/StringOption.java | 196 +-
.../sf/freecol/common/option/UnitListOption.java | 67 +
.../sf/freecol/common/option/UnitTypeOption.java | 360 ++
.../sf/freecol/common/resources/AudioResource.java | 97 +
.../sf/freecol/common/resources/ChipResource.java | 241 +
.../sf/freecol/common/resources/ColorResource.java | 113 +
src/net/sf/freecol/common/resources/FAFile.java | 256 +
.../freecol/common/resources/FAFileResource.java | 68 +
.../sf/freecol/common/resources/FontResource.java | 119 +
.../sf/freecol/common/resources/ImageResource.java | 145 +-
src/net/sf/freecol/common/resources/Resource.java | 46 +-
.../freecol/common/resources/ResourceFactory.java | 76 +-
.../freecol/common/resources/ResourceManager.java | 289 +-
.../freecol/common/resources/ResourceMapping.java | 14 +-
.../sf/freecol/common/resources/SZAResource.java | 41 +-
src/net/sf/freecol/common/resources/Video.java | 43 +
.../sf/freecol/common/resources/VideoResource.java | 18 +-
src/net/sf/freecol/common/util/EmptyIterator.java | 2 +-
src/net/sf/freecol/common/util/Introspector.java | 47 +-
src/net/sf/freecol/common/util/RandomChoice.java | 26 +-
.../freecol/common/util/ReplayableInputStream.java | 2 +-
src/net/sf/freecol/common/util/Utils.java | 54 +-
src/net/sf/freecol/common/util/XMLStream.java | 41 +-
src/net/sf/freecol/common/util/Xml.java | 2 +-
src/net/sf/freecol/metaserver/MetaItem.java | 2 +-
src/net/sf/freecol/metaserver/MetaRegister.java | 9 +-
src/net/sf/freecol/metaserver/MetaServer.java | 2 +-
src/net/sf/freecol/metaserver/NetworkHandler.java | 8 +-
src/net/sf/freecol/server/FreeColServer.java | 1489 +++--
src/net/sf/freecol/server/ai/AIColony.java | 2138 +++----
src/net/sf/freecol/server/ai/AIGoods.java | 208 +-
.../sf/freecol/server/ai/AIInGameInputHandler.java | 358 +-
src/net/sf/freecol/server/ai/AIMain.java | 363 +-
src/net/sf/freecol/server/ai/AIMessage.java | 599 ++
src/net/sf/freecol/server/ai/AIObject.java | 97 +-
src/net/sf/freecol/server/ai/AIPlayer.java | 656 +-
src/net/sf/freecol/server/ai/AIUnit.java | 240 +-
.../sf/freecol/server/ai/CacheEntryComparator.java | 2 +-
src/net/sf/freecol/server/ai/ColonialAIPlayer.java | 1566 -----
src/net/sf/freecol/server/ai/ColonyPlan.java | 2263 ++++---
src/net/sf/freecol/server/ai/ColonyProfile.java | 99 -
src/net/sf/freecol/server/ai/EuropeanAIPlayer.java | 1674 +++--
src/net/sf/freecol/server/ai/GoodsWish.java | 247 +-
src/net/sf/freecol/server/ai/IndianAIPlayer.java | 404 --
src/net/sf/freecol/server/ai/NativeAIPlayer.java | 861 +++
src/net/sf/freecol/server/ai/NewAIPlayer.java | 576 --
src/net/sf/freecol/server/ai/ProductionCache.java | 115 +-
src/net/sf/freecol/server/ai/REFAIPlayer.java | 528 +-
src/net/sf/freecol/server/ai/StandardAIPlayer.java | 2367 -------
.../sf/freecol/server/ai/TileImprovementPlan.java | 98 +-
src/net/sf/freecol/server/ai/Transportable.java | 52 +-
src/net/sf/freecol/server/ai/ValuedAIObject.java | 25 +-
src/net/sf/freecol/server/ai/Wish.java | 76 +-
src/net/sf/freecol/server/ai/WorkLocationPlan.java | 152 +-
src/net/sf/freecol/server/ai/WorkerWish.java | 66 +-
.../ai/goal/CreateMissionAtSettlementGoal.java | 41 +-
src/net/sf/freecol/server/ai/goal/Goal.java | 226 +-
.../sf/freecol/server/ai/goal/GoalConstants.java | 2 +-
.../freecol/server/ai/goal/GotoAdjacentGoal.java | 50 +-
.../server/ai/goal/ManageMissionariesGoal.java | 65 +-
.../server/ai/mission/BuildColonyMission.java | 612 +-
.../ai/mission/CashInTreasureTrainMission.java | 95 +-
.../server/ai/mission/DefendSettlementMission.java | 425 +-
.../server/ai/mission/IdleAtColonyMission.java | 147 +-
.../server/ai/mission/IndianBringGiftMission.java | 197 +-
.../server/ai/mission/IndianDemandMission.java | 279 +-
src/net/sf/freecol/server/ai/mission/Mission.java | 887 +--
.../server/ai/mission/PioneeringMission.java | 957 ++-
.../server/ai/mission/PrivateerMission.java | 345 +-
.../freecol/server/ai/mission/ScoutingMission.java | 202 +-
.../server/ai/mission/TransportMission.java | 1393 ++--
.../ai/mission/UnitSeekAndDestroyMission.java | 270 +-
.../ai/mission/UnitWanderHostileMission.java | 86 +-
.../server/ai/mission/UnitWanderMission.java | 76 +-
.../server/ai/mission/WishRealizationMission.java | 209 +-
.../server/ai/mission/WorkInsideColonyMission.java | 139 +-
src/net/sf/freecol/server/control/ChangeSet.java | 1331 ++++
src/net/sf/freecol/server/control/Controller.java | 10 +-
.../server/control/FreeColServerHolder.java | 13 +-
.../freecol/server/control/InGameController.java | 4652 +++++++++++---
.../freecol/server/control/InGameInputHandler.java | 3195 ++--------
.../sf/freecol/server/control/InputHandler.java | 26 +-
.../freecol/server/control/PreGameController.java | 158 +-
.../server/control/PreGameInputHandler.java | 101 +-
.../server/control/ServerModelController.java | 570 --
.../server/control/UserConnectionHandler.java | 95 +-
.../sf/freecol/server/generator/IMapGenerator.java | 22 -
.../sf/freecol/server/generator/LandGenerator.java | 93 +-
.../sf/freecol/server/generator/MapGenerator.java | 914 +--
.../server/generator/MapGeneratorOptions.java | 449 --
src/net/sf/freecol/server/generator/River.java | 156 +-
.../sf/freecol/server/generator/RiverSection.java | 52 +-
.../server/generator/SimpleMapGenerator.java | 1094 ++++
.../freecol/server/generator/TerrainGenerator.java | 604 +-
src/net/sf/freecol/server/model/DemandSession.java | 97 +
.../sf/freecol/server/model/DiplomacySession.java | 57 +
src/net/sf/freecol/server/model/LootSession.java | 58 +
.../sf/freecol/server/model/ServerBuilding.java | 205 +
src/net/sf/freecol/server/model/ServerColony.java | 702 ++
.../sf/freecol/server/model/ServerColonyTile.java | 121 +
src/net/sf/freecol/server/model/ServerEurope.java | 157 +
src/net/sf/freecol/server/model/ServerGame.java | 353 +-
.../server/model/ServerIndianSettlement.java | 219 +
.../sf/freecol/server/model/ServerModelObject.java | 36 +-
src/net/sf/freecol/server/model/ServerPlayer.java | 3555 ++++++++++-
src/net/sf/freecol/server/model/ServerRegion.java | 8 +-
src/net/sf/freecol/server/model/ServerUnit.java | 1037 +++
src/net/sf/freecol/server/model/TradeSession.java | 100 +
.../freecol/server/model/TransactionSession.java | 157 +
.../freecol/server/networking/DummyConnection.java | 45 +-
src/net/sf/freecol/server/networking/Server.java | 5 +-
src/net/sf/freecol/tools/DesktopEntry.java | 108 +
src/net/sf/freecol/tools/FSGConverter.java | 2 +-
src/net/sf/freecol/tools/FlagTest.java | 239 +
.../sf/freecol/tools/InstallerTranslations.java | 33 +-
src/net/sf/freecol/tools/MapConverter.java | 73 +
src/net/sf/freecol/tools/MergeTranslations.java | 15 +-
src/net/sf/freecol/tools/SaveGameValidator.java | 2 +-
src/net/sf/freecol/tools/TranslationReport.java | 2 +-
test/data/specification.xml | 1 +
test/src/net/sf/freecol/AllTests.java | 4 +-
test/src/net/sf/freecol/client/AllTests.java | 5 +-
.../net/sf/freecol/client/ClientTestHelper.java | 39 +-
test/src/net/sf/freecol/client/WorkerCheck.java | 2 +-
.../net/sf/freecol/client/control/AllTests.java | 2 +-
.../net/sf/freecol/client/control/MoveTest.java | 45 +-
test/src/net/sf/freecol/client/gui/AllTests.java | 37 +
test/src/net/sf/freecol/client/gui/FontTest.java | 80 +
.../net/sf/freecol/client/gui/i18n/AllTests.java | 3 +-
.../net/sf/freecol/client/gui/i18n/CLDRTest.java | 114 +
test/src/net/sf/freecol/client/gui/i18n/Merge.java | 2 +-
.../client/gui/i18n/MergeTableCellRenderer.java | 2 +-
.../freecol/client/gui/i18n/MergeTableModel.java | 2 +-
.../sf/freecol/client/gui/i18n/MessageMerge.java | 2 +-
.../sf/freecol/client/gui/i18n/MessagesTest.java | 452 +-
.../net/sf/freecol/client/gui/sound/SoundTest.java | 142 +-
test/src/net/sf/freecol/common/AllTests.java | 7 +-
.../net/sf/freecol/common/SpecificationTest.java | 261 -
test/src/net/sf/freecol/common/io/AllTests.java | 33 +
test/src/net/sf/freecol/common/io/ModTest.java | 56 +
.../sf/freecol/common/model/AbstractUnitTest.java | 4 +-
test/src/net/sf/freecol/common/model/AllTests.java | 12 +-
.../freecol/common/model/BaseCostDeciderTest.java | 121 +-
.../net/sf/freecol/common/model/BuildingTest.java | 557 +-
.../common/model/ColonyConsumptionTest.java | 167 -
.../freecol/common/model/ColonyProductionTest.java | 433 +-
.../net/sf/freecol/common/model/ColonyTest.java | 552 +-
.../net/sf/freecol/common/model/CombatTest.java | 656 +-
.../net/sf/freecol/common/model/ContactTest.java | 295 -
.../net/sf/freecol/common/model/DemotionTest.java | 361 --
.../freecol/common/model/DiplomaticTradeTest.java | 157 -
.../net/sf/freecol/common/model/EuropeTest.java | 42 +
.../freecol/common/model/FoundingFatherTest.java | 359 +-
test/src/net/sf/freecol/common/model/GameTest.java | 61 +-
.../freecol/common/model/GoodsContainerTest.java | 48 +-
.../src/net/sf/freecol/common/model/GoodsTest.java | 390 +-
.../net/sf/freecol/common/model/HighSeasTest.java | 40 +
.../freecol/common/model/IndianSettlementTest.java | 373 +-
.../freecol/common/model/IndividualFatherTest.java | 359 ++
.../src/net/sf/freecol/common/model/LimitTest.java | 188 +
test/src/net/sf/freecol/common/model/MapTest.java | 216 +-
.../net/sf/freecol/common/model/MarketTest.java | 129 +-
.../sf/freecol/common/model/ModelMessageTest.java | 72 +-
.../net/sf/freecol/common/model/ModifierTest.java | 21 +-
.../net/sf/freecol/common/model/MonarchTest.java | 35 +-
.../net/sf/freecol/common/model/MovementTest.java | 172 +-
.../sf/freecol/common/model/NationTypeTest.java | 177 +-
.../net/sf/freecol/common/model/PlayerTest.java | 278 +-
.../net/sf/freecol/common/model/SchoolTest.java | 1294 +---
.../src/net/sf/freecol/common/model/ScopeTest.java | 43 +-
.../sf/freecol/common/model/SerializationTest.java | 145 +-
.../sf/freecol/common/model/SettlementTest.java | 74 +-
test/src/net/sf/freecol/common/model/SoLTest.java | 22 +-
.../sf/freecol/common/model/SpecificationTest.java | 299 +
.../common/model/TileItemContainerTest.java | 8 +-
test/src/net/sf/freecol/common/model/TileTest.java | 508 +-
test/src/net/sf/freecol/common/model/UnitTest.java | 1160 +---
.../freecol/common/model/UnitTypeChangeTest.java | 59 +-
.../src/net/sf/freecol/common/option/AllTests.java | 33 +
.../net/sf/freecol/common/option/OptionTest.java | 73 +
test/src/net/sf/freecol/server/AllTests.java | 2 +-
test/src/net/sf/freecol/server/SaveLoadTest.java | 39 +-
.../net/sf/freecol/server/ServerTestHelper.java | 210 +-
.../src/net/sf/freecol/server/ai/AIColonyTest.java | 612 +-
test/src/net/sf/freecol/server/ai/AllTests.java | 29 +-
.../net/sf/freecol/server/ai/ColonyPlanTest.java | 670 +-
test/src/net/sf/freecol/server/ai/ContactTest.java | 358 ++
.../freecol/server/ai/MissionAssignmentTest.java | 493 +-
test/src/net/sf/freecol/server/ai/REFTest.java | 237 +-
.../sf/freecol/server/ai/StandardAIPlayerTest.java | 271 +-
test/src/net/sf/freecol/server/ai/TensionTest.java | 160 +-
.../net/sf/freecol/server/ai/mission/AllTests.java | 2 +-
.../server/ai/mission/PioneeringMissionTest.java | 162 +-
.../server/ai/mission/PrivateerMissionTest.java | 214 +-
.../server/ai/mission/ScoutingMissionTest.java | 126 +-
.../server/ai/mission/TransportMissionTest.java | 363 +-
.../ai/mission/UnitSeekAndDestroyMissionTest.java | 102 +-
.../net/sf/freecol/server/control/AllTests.java | 2 +-
.../server/control/InGameControllerTest.java | 2152 ++++++-
.../net/sf/freecol/server/generator/AllTests.java | 2 +-
.../freecol/server/generator/MapGeneratorTest.java | 111 +-
test/src/net/sf/freecol/server/model/AllTests.java | 6 +-
.../freecol/server/model/ServerBuildingTest.java | 1185 ++++
.../sf/freecol/server/model/ServerColonyTest.java | 391 ++
.../server/model/ServerIndianSettlementTest.java | 245 +
.../sf/freecol/server/model/ServerPlayerTest.java | 555 +-
.../sf/freecol/server/model/ServerUnitTest.java | 440 ++
.../net/sf/freecol/util/test/FreeColTestCase.java | 537 +-
.../net/sf/freecol/util/test/FreeColTestUtils.java | 85 +-
.../net/sf/freecol/util/test/MockMapGenerator.java | 67 +-
.../sf/freecol/util/test/MockModelController.java | 87 +-
.../net/sf/freecol/util/test/MockPseudoRandom.java | 38 +-
2317 files changed, 188702 insertions(+), 217498 deletions(-)
diff --cc debian/changelog
index 168ae83,0000000..606784e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,188 -1,0 +1,250 @@@
++freecol (0.10.5+dfsg-1+deb7u1) stable; urgency=low
++
++ * Disable intro video to avoid hanging at startup (closes: #771700)
++
++ -- Vincent Fourmond <fourmond at debian.org> Sat, 20 Dec 2014 23:57:15 +0100
++
++freecol (0.10.5+dfsg-1) unstable; urgency=low
++
++ * New upstream release
++ * Bump standards version
++ * Refresh patches/40-manpage.diff
++
++ -- Vincent Fourmond <fourmond at debian.org> Tue, 06 Mar 2012 00:10:22 +0100
++
++freecol (0.10.0+dfsg-5) unstable; urgency=low
++
++ [ Giovanni Mascellani ]
++ * Remove the libwoodstox-java dependency, which isn't necessary.
++ (closes: #650745)
++
++ [ Vincent Fourmond ]
++ * Fix classpath, which fixes problems with starting the game when newer
++ woodstox is installed (closes: #657866)
++
++ -- Vincent Fourmond <fourmond at debian.org> Sun, 29 Jan 2012 16:04:03 +0100
++
++freecol (0.10.0+dfsg-4) unstable; urgency=low
++
++ * Handle the rename of ttf-liberation to fonts-liberation (and the
++ corresponding file rename)
++
++ -- Vincent Fourmond <fourmond at debian.org> Mon, 24 Oct 2011 19:28:57 +0200
++
++freecol (0.10.0+dfsg-3) unstable; urgency=low
++
++ * Fix FTBS with recent openjdk-6 (closes: #642788)
++
++ -- Vincent Fourmond <fourmond at debian.org> Thu, 29 Sep 2011 21:40:24 +0200
++
++freecol (0.10.0+dfsg-2) unstable; urgency=low
++
++ * Refrain from installing the Liberation fonts, and symlink from those
++ in ttf-liberation
++ * Use javahelper for dependencies
++
++ -- Vincent Fourmond <fourmond at debian.org> Sat, 25 Jun 2011 21:44:41 +0200
++
++freecol (0.10.0+dfsg-1) unstable; urgency=low
++
++ * New upstream release (closes: #631611)
++ * Disable disable-listener.diff, now incorporated upstream (thanks !)
++ * Refreshed other patches
++ * Now using javahelper to handle installation and classpath tweaks (I
++ can't decently ignore lintian warnings I wrote ;-)...)
++ * Pass -Dbuild.sysclasspath=only to ant to fully ignore classpath in
++ the build file.
++ * Conforms to newer standards (3.9.2)
++ * Small improvements in the package description
++ * Increase a bit the memory allocated to freecol
++
++ -- Vincent Fourmond <fourmond at debian.org> Sat, 25 Jun 2011 18:18:38 +0200
++
+freecol (0.9.2+dfsg-2) unstable; urgency=low
+
+ * Now pass -Xincgc as java argument, as GC crashes apparently do not
+ occur using this GC engine. Closes: #583692 (BTW, it seems to
+ significantly speed up AI turn)
+ * Already conforms to 3.9.0
+
+ -- Vincent Fourmond <fourmond at debian.org> Wed, 21 Jul 2010 00:44:19 +0200
+
+freecol (0.9.2+dfsg-1) unstable; urgency=low
+
+ * New upstream release (closes: #567803)
+ * Switch to 3.0 (quilt) format + bzip2 repackaged archive
+ * Droping dependency on libhiglayout-java, apparently not needed anymore
+ * New dependencies:
+ - libcommons-cli-java
+ - libmiglayout-java
+ - libcortado-java
+ * Dropped dependency on dpatch now that we use format 3.0 (quilt)
- * disable-listener.diff to disabled what seems to be a custom feature
++ * disable-listener.diff to disable what seems to be a custom feature
+ from cortado
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 07 Mar 2010 18:00:39 +0100
+
+freecol (0.8.4+dfsg-2) unstable; urgency=low
+
+ * Disable IPV6 networking stack by default to work around Java bug
+ (see #560056) (closes: #562133)
+ * Already conforms to standards 3.8.3
+ * Update build-deps to reflect changes in TeXLive
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 07 Jan 2010 22:53:26 +0100
+
+freecol (0.8.4+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Minor modifications to the debian/new-upstream script
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 08 Aug 2009 21:27:55 +0200
+
+freecol (0.8.3+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Use viewsvn rather than wsvn for the Vcs-Browser field
+ * Now use a +dfsg instead of .dfsg (thanks lintian)
+ * Already conforms to standards 3.8.2
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 27 Jun 2009 18:01:03 +0200
+
+freecol (0.8.1.dfsg-1) unstable; urgency=low
+
+ * New upstream release (closes: #514363)
+ - saves the log in ~/.freecol (closes: #488330)
+ - does not mess up language settings (closes: #497076)
+ * Adding alternate dependency on the virtual package java6-runtime, since
+ all variants seem to be able to run freecol. (closes: #503810)
+ * Switched to a machine-readable debian/copyright file
+ * Updated to small newer features of java-wrappers (and bumped the
+ version dependency accordingly)
+ * Added a debian/README.source to mention the use of a patch system,
+ which makes it now comply to standards 3.8.0
+ * Adding ${misc:Depends} for potential debhelper-induced dependencies
+ * Refreshed debian/patches/10-fix-jar-path.dpatch
+ * Dropped debian/patches/25-change-save-dir.dpatch, superseded by
+ upstream modifications
+ * Remove unapplied patches
+ * Switch to using cdbs for building
+ * Update debian/NEWS to mention that save games from earlier
+ versions are not compatible.
+
+ -- Vincent Fourmond <fourmond at debian.org> Tue, 24 Feb 2009 18:55:19 +0100
+
+freecol (0.7.4.dfsg+1-1) unstable; urgency=low
+
+ * Pseudo new upstream release to work around dak's
+ move-from-contrib-to-main bug.
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 10 Aug 2008 16:59:02 +0200
+
+freecol (0.7.4.dfsg-2) unstable; urgency=low
+
+ * Fix watchfile to ignore the alpha releases (users and developers
+ seem to complain about their stability).
+ * Add openjdk in the wrapper script, and tighten up dependency on
+ java-wrappers accordingly.
+ * freecol can now move to main ! (closes: #491260)
+ * Adapted wrapper/freecol to work around a java-wrappers bug
+ * Document undocumented patches, and drop 15-fix-jar-manifest which
+ really isn't necessary now that we are using java-wrappers.
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 10 Aug 2008 14:42:28 +0200
+
+freecol (0.7.4.dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+ * Finally add a .dfsg suffix to the version number, to reflect the
+ fact that the upstream tarball is repackaged (since this time I
+ had forgotten that ;-)...).
+ * Update debian/new-upstream and debian/watch accordingly
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 22 Jun 2008 09:21:57 +0200
+
+freecol (0.7.3-4) unstable; urgency=low
+
+ * Mmmm, also add openjdk-6 as JAVA_HOME in debian/rules (closes: #480107)
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 16 May 2008 19:21:43 +0200
+
+freecol (0.7.3-3) unstable; urgency=low
+
+ * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to
+ Matvey Kozhev <inetperson at gmail.com> for pointing out (closes: #480107)
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 08 May 2008 08:32:20 +0200
+
+freecol (0.7.3-2) unstable; urgency=low
+
+ * Pushing memory limit to 180M, as it does not work anymore on AMD64 with
+ only 128M...
+
+ -- Vincent Fourmond <fourmond at debian.org> Sat, 03 May 2008 21:18:05 +0200
+
+freecol (0.7.3-1) unstable; urgency=low
+
+ [ Ansgar Burchardt ]
+ * Remove deprecated Encoding key from .desktop file
+
+ [ Vincent Fourmond ]
+ * New upstream release (Closes: #465490)
+ - dropped 30-language-option, included upstream
+ - updated 10-fix-jar-path and 15-fix-jar-manifest
+ * Now providing a debian/new-upstream to repackage upstream tarball
+ * Added a NEWS file
+ * Switched to java-wrappers for the wrapper script
+ - 40-manpage to point the user to java-wrappers(7)
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 29 Feb 2008 23:09:02 +0100
+
+freecol (0.7.2-5) unstable; urgency=low
+
+ * Bumped standards-version to 3.7.3 (no changes required)
+ * Added many changes by Matvey Kozhev <sikon at lucidfox.org> for
+ Ubuntu (closes: #453836)
+ - added a desktop file
+ - fix wrapper file position and pathes
+ - added icedtea dependencies
+ * Added an icon for the menu
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 14 Dec 2007 01:18:14 +0100
+
+freecol (0.7.2-4) unstable; urgency=low
+
+ * Pull upstream revision 3270 to add a --default-locale option
+ * Used this option to detect when LC_MESSAGES is different from
+ LC_CTYPE (Closes: #450944)
+
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 26 Nov 2007 20:25:41 +0100
+
+freecol (0.7.2-3) unstable; urgency=low
+
+ * Add a dependency on j2re1.6 for java-package made packages
+ (Closes: #452407)
+ * Added various meta-information field to debian/control
+
+ -- Vincent Fourmond <fourmond at debian.org> Thu, 22 Nov 2007 19:21:34 +0100
+
+freecol (0.7.2-2) unstable; urgency=high
+
+ [ Barry deFreese ]
+ * Fix watch file
+
+ [ Vincent Fourmond ]
+ * Apparently, I cannot build freecol for java5, as libraries
+ are missing. Switching to java6 (Closes: #448082, #448083)
+ * Urgency high to fix two RC bugs in testing
+ * Fixing table of contents and links in PDF manual
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 26 Oct 2007 21:27:20 +0200
+
+freecol (0.7.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #444199)
+ * {10,15}-fix-jar*: switch to external libraries for binary only jars.
+ * 20-freecol-executable: the freecol executable.
+ * 25-change-save-dir: switch saves directory to ~/.freecol
+ * Menu entry
+
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 08 Oct 2007 15:56:18 +0200
diff --cc debian/control
index 8310faf,0000000..4e0a7b0
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,25 -1,0 +1,25 @@@
+Source: freecol
+Section: games
+Priority: optional
+Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Uploaders: Vincent Fourmond <fourmond at debian.org>
+Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs
- Build-Depends-Indep: libwoodstox-java,
++Build-Depends-Indep:
+ tex4ht, texlive-binaries | texlive-base-bin, ant-optional,
+ texlive-latex-recommended, libcommons-cli-java, libmiglayout-java,
- libcortado-java
- Standards-Version: 3.9.0
++ libcortado-java, javahelper
++Standards-Version: 3.9.3
+Homepage: http://www.freecol.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol
+
+Package: freecol
+Architecture: all
+Depends: openjdk-6-jre | java6-runtime,
- libwoodstox-java, java-wrappers (>= 0.1.13), ${misc:Depends},
- libcommons-cli-java, libmiglayout-java, libcortado-java
- Description: an open version of Colonization
++ java-wrappers (>= 0.1.13), ${misc:Depends}, ${java:Depends},
++ fonts-liberation (>= 1.07.0-2~)
++Description: open source remake of the old Colonization
+ freecol is a game in the spirit of Civilization but taking place in a
- colonial background. Colonize a new world, build towns, trade or fight
- with natives and other European civilizations, trade with your
++ colonial background. Colonize the new world, build towns, trade or
++ fight with natives and other European civilizations, trade with your
+ homeland until you're ready to fight for your independance !
diff --cc debian/freecol.classpath
index 0000000,0000000..a356045
new file mode 100644
--- /dev/null
+++ b/debian/freecol.classpath
@@@ -1,0 -1,0 +1,1 @@@
++usr/share/java/freecol.jar miglayout.jar cortado.jar commons-cli.jar
diff --cc debian/freecol.install
index 0000000,0000000..ad2bd75
new file mode 100644
--- /dev/null
+++ b/debian/freecol.install
@@@ -1,0 -1,0 +1,6 @@@
++data/* usr/share/games/freecol
++debian/wrapper/freecol usr/games
++debian/freecol.desktop usr/share/applications
++freecol.xpm usr/share/pixmaps
++
++
diff --cc debian/freecol.jlibs
index 0000000,0000000..e8d5ace
new file mode 100644
--- /dev/null
+++ b/debian/freecol.jlibs
@@@ -1,0 -1,0 +1,1 @@@
++freecol.jar
diff --cc debian/new-upstream
index dd90147,0000000..7918f3b
mode 100755,000000..100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@@ -1,48 -1,0 +1,50 @@@
+#!/bin/sh
+#
+# new-upstream: copyright 2007 by Vincent Fourmond.
+# See debian/copyright file for details.
+#
+# Called by uscan; from uscan(1):
+#
+# Finally, if a third parameter (an action) is given in the watchfile
+# line, this is taken as the name of a command, and the command
+# command --upstream-version version filename
+#
+# is executed, using either the original file or the symlink name.
+#
+# Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
+#
+
+# If called manually, this file must be called from within the freecol/
+# directory.
+
+version=$2
+filename=`readlink -f $3`
+
+dir=`mktemp -d`
+
+curdir=`pwd`
+
+origname=freecol_$version"+dfsg".orig.tar.bz2
+
+echo "Repackaging freecol version $version from $filename"
+echo $filename
+echo $version
+
+# Abort on errors:
+set -e
+
+# We repackage the upstream source file, according to the method
+# written in debian/copyrigh
+cd $dir
- tar xvzf $filename
++# tar xvzf $filename
++# Now using unzip:
++unzip $filename
+cd $dir/freecol*
- patch -p0 < $curdir/debian/freecol-dist-targz.diff
++patch --no-backup-if-mismatch -p0 < $curdir/debian/freecol-dist-targz.diff
+echo $version | ant tarDistBundle
+# Do not remove the original file !!!
+# rm $curdir/$filename
+echo "Moving back dist/freecol-$version-dist-src.tar.bz2 to $curdir/../$origname"
+mv dist/freecol-$version-dist-src.tar.bz2 $curdir/../$origname
+cd -
+rm -rf $dir
diff --cc debian/patches/10-fix-jar-path.diff
index 3a609e9,0000000..501fe1f
mode 100755,000000..100755
--- a/debian/patches/10-fix-jar-path.diff
+++ b/debian/patches/10-fix-jar-path.diff
@@@ -1,33 -1,0 +1,33 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix-jar-path.dpatch by <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix the path of the library jars to match those of the debian
+## DP: packages
+
+ at DPATCH@
- Index: freecol-0.9.2+dfsg/build.xml
++Index: freecol-0.10.0+dfsg/build.xml
+===================================================================
- --- freecol-0.9.2+dfsg.orig/build.xml 2010-03-07 16:44:05.000000000 +0100
- +++ freecol-0.9.2+dfsg/build.xml 2010-03-07 17:01:00.251526957 +0100
- @@ -87,9 +87,10 @@
++--- freecol-0.10.0+dfsg.orig/build.xml 2011-06-25 17:12:29.000000000 +0200
+++++ freecol-0.10.0+dfsg/build.xml 2011-06-25 17:17:57.346240904 +0200
++@@ -105,9 +105,10 @@
+ <!-- Compiles the java source files. -->
+ <target name="compile" depends="init">
+ <mkdir dir="${freecol.build.dir}"/>
++ <!-- Classpath is provided by debian/rules, so commenting this -->
++ <!-- classpathref="freecol.build.classpath" -->
+ <javac srcdir="${freecol.src.dir}"
+ destdir="${freecol.build.dir}"
+- classpathref="freecol.build.classpath"
+ debug="on"
+ optimize="on"
+ deprecation="off"
- @@ -148,7 +149,7 @@
++@@ -158,7 +159,7 @@
+
+ <!-- Compiles the source files and creates a JAR-file. -->
+ <target name="package" depends="init,build,manifest" description="Compiles the source files and creates a JAR-file.">
+- <jar jarfile="${freecol.jar.file}"
++ <jar jarfile="freecol.jar"
+ basedir="${freecol.build.dir}"
+ manifest="${basedir}/src/MANIFEST.MF"
+ includes="net/**, org/**"
diff --cc debian/patches/40-manpage.diff
index 3c4b896,0000000..12b1c48
mode 100755,000000..100755
--- a/debian/patches/40-manpage.diff
+++ b/debian/patches/40-manpage.diff
@@@ -1,37 -1,0 +1,37 @@@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-manpage.dpatch by <fourmond at debian.org>
+##
+## DP: Small java-wrappers addition in the manual page
+
+ at DPATCH@
- Index: freecol-0.9.2+dfsg/packaging/debian/freecol.6
++Index: freecol-0.10.5+dfsg/packaging/debian/freecol.6
+===================================================================
- --- freecol-0.9.2+dfsg.orig/packaging/debian/freecol.6 2010-03-07 16:44:05.000000000 +0100
- +++ freecol-0.9.2+dfsg/packaging/debian/freecol.6 2010-03-07 17:01:03.371521135 +0100
++--- freecol-0.10.5+dfsg.orig/packaging/debian/freecol.6 2012-03-05 22:10:30.000000000 +0100
+++++ freecol-0.10.5+dfsg/packaging/debian/freecol.6 2012-03-05 23:36:51.633239995 +0100
+@@ -59,8 +59,25 @@
- Starts a stand-alone server on the specifed port.
++ Starts a stand-alone server on the specified port.
+ .SH LICENSE
+ FreeCol is available under GPL license terms.
++
++.SH JAVA-WRAPPERS NOTE
++
++This program is a shell script wrapper based on
++.BR java-wrappers (7).
++You therefore benefit from several features; please see the
++.BR java-wrappers (7)
++manual page.
++
++
+ .SH SEE ALSO
++
+ Homepage: http://freecol.sourceforge.net/
++
++.BR java-wrappers (7)
++
+ .SH AUTHOR
+-This manual page was written by Jean Lepropre <jean_lepropre at users.sourceforge.net>,
++This manual page was written by Jean Lepropre
++<jean_lepropre at users.sourceforge.net>,
+ for the Debian project (but may be used by others).
++
++It was updated by Vincent Fourmond <fourmond at debian.org>
diff --cc debian/patches/series
index 1e5174d,0000000..ca75487
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,3 @@@
- disable-listener.diff
++# disable-listener.diff
+10-fix-jar-path.diff
+40-manpage.diff
diff --cc debian/rules
index 584f65a,0000000..0a60ed1
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,35 -1,0 +1,38 @@@
+#!/usr/bin/make -f
+
+# debian/rules file for building freecol
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
+ sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \
+ sed -r 's/(\.dfsg)?-[0-9.]+//')
+
+# export JITC_PROCESSOR_TYPE=6
+
+include /usr/share/cdbs/1/rules/debhelper.mk
++include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/cdbs/1/class/ant.mk
- # include /usr/share/cdbs/1/rules/dpatch.mk
+
- JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
++arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
++
++JAVA_HOME_DIRS := /usr/lib/jvm/java-7-openjdk-$(arch) \
++ /usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk
+ANT_HOME := /usr/share/ant
+DEB_JARS := ant-launcher ant-nodeps \
- miglayout wstx-lgpl commons-cli cortado
++ miglayout commons-cli cortado
+DEB_ANT_COMPILER := modern
+DEB_ANT_BUILD_TARGET := package online-manual print-manual
+DEB_BUILDDIR := .
+DEB_ANT_BUILDFILE := build.xml
+DEB_ANT_CLEAN_TARGET := clean
++# Override build classpath
++ANT_OPTS := -Dbuild.sysclasspath=only
+
- target_jar_dir= debian/freecol/usr/share/java
++LIBERATION_FONTS := LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf
+
- print-version:
- echo $(VERSION)
++# Refrain from installing those files
++DEB_DH_INSTALL_ARGS = $(patsubst %,-X%, $(LIBERATION_FONTS))
+
- install/freecol::
- install -m 644 freecol.jar $(target_jar_dir)/freecol-$(VERSION).jar
- ln -s freecol-$(VERSION).jar $(target_jar_dir)/freecol.jar
++DEB_DH_LINK_freecol = $(foreach file, $(LIBERATION_FONTS), usr/share/fonts/truetype/liberation/$(file) usr/share/games/freecol/base/resources/fonts/$(file))
diff --cc debian/watch
index e4a56c4,0000000..ed0c729
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,8 -1,0 +1,8 @@@
+# Compulsory line, this is a version 3 file
+version=3
+
+# Don't forget to look into debian/copyright first before packaging
+# a new upstream version !!! The watchfile works, but the downloaded
+# archive should not go to debian - you need to repackage it.
+opts=dversionmangle=s/\+dfsg// \
- http://sf.net/freecol/freecol-(?!.*alpha)(.*)-src\.tar\.gz debian debian/new-upstream
++http://sf.net/freecol/freecol-(?!.*alpha)(.*)-src\.zip debian debian/new-upstream
diff --cc debian/wrapper/freecol
index 365c26a,0000000..6f597fe
mode 100755,000000..100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@@ -1,28 -1,0 +1,28 @@@
+#!/bin/bash
+
+# Including wrapper script:
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+# We need openjdk, icedtea or Sun 6
+find_java_runtime openjdk java6
+
- find_jars miglayout wstx-lgpl freecol cortado commons-cli
++find_jars miglayout freecol cortado commons-cli
+
+# We test if LC_MESSAGES is different from LC_CTYPE, if that is the case,
+# we pass to freecol the --default-locale argument
+if [ "$LC_CTYPE" != "$LC_MESSAGES" -a "$LC_MESSAGES" ]; then
+ lang_argument="--default-locale=$LC_MESSAGES"
+fi
+
+if [ "$1" = "--enable-ipv6" ]; then
+ shift;
+else
+ echo "Disabling IPV6 network stack to work around bug #560056 on openjdk"
+ echo "If you experience problems with connecting to remote servers, "
+ echo "you can put it back by running Freecol this way:"
+ echo " freecol --enable-ipv6" "$@"
+ disablenet="-Djava.net.preferIPv4Stack=true"
+fi
+
- run_java $disablenet -Xincgc -Xmx180M net.sf.freecol.FreeCol --freecol-data \
++run_java $disablenet -Xincgc -Xmx512M net.sf.freecol.FreeCol --no-intro --freecol-data \
+ /usr/share/games/freecol $lang_argument "$@"
--
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