Skip to content

Commit

Permalink
Merge branch 'master' into slim
Browse files Browse the repository at this point in the history
  • Loading branch information
wintertime committed Apr 4, 2021
2 parents 7b62759 + 65c3663 commit 0cdf8fe
Show file tree
Hide file tree
Showing 932 changed files with 9,563 additions and 5,473 deletions.
67 changes: 67 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '41 14 * * 5'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
language: [ 'java' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
13 changes: 13 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Security Policy

## Supported Versions

| Version | Supported |
| ------- | ------------------ |
| 0.11.7-dev | :white_check_mark: |
| 0.11.6 | :white_check_mark: |
| < 0.11.6 | :x: |

## Reporting a Vulnerability

Email [email protected] for any major security vulnerabilities.
4 changes: 2 additions & 2 deletions build/skeletons/universalJavaApplicationStub
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
# #
# @author Tobias Fischer #
# @url https://github.com/tofi86/universalJavaApplicationStub #
# @date 2020-03-19 #
# @date 2021-03-19 #
# @version 3.0.6 #
# #
##################################################################################
# #
# The MIT License (MIT) #
# #
# Copyright (c) 2014-2020 Tobias Fischer #
# Copyright (c) 2014-2021 Tobias Fischer #
# #
# Permission is hereby granted, free of charge, to any person obtaining a copy #
# of this software and associated documentation files (the "Software"), to deal #
Expand Down
2 changes: 1 addition & 1 deletion data/base/client-options.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/base/roles-compat.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/base/unit-change-types-compat.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/mods/bryce/specification.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/mods/convertUpgrade/specification.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/mods/example/specification.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/mods/plantForest/specification.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/rules/classic/resources.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1335,7 +1335,7 @@ image.tile.model.improvement.river.s1210=resources/images/river/river16.png
image.tile.model.improvement.river.s2210=resources/images/river/river17.png
image.tile.model.improvement.river.s0020=resources/images/river/river18.png
image.tile.model.improvement.river.s1020=resources/images/river/river19.png
image.tile.model.improvement.river.s2020=resources/images/river/river20.png
image.tile.model.improvement.river.s2021=resources/images/river/river20.png
image.tile.model.improvement.river.s0120=resources/images/river/river21.png
image.tile.model.improvement.river.s1120=resources/images/river/river22.png
image.tile.model.improvement.river.s2120=resources/images/river/river23.png
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/rules/classic/resources/images/buildings/warehouse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion data/rules/classic/specification.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/rules/freecol/specification.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
2 changes: 1 addition & 1 deletion data/rules/testing/specification.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2002-2020 The FreeCol Team
* Copyright (C) 2002-2021 The FreeCol Team
*
* This file is part of FreeCol.
*
Expand Down
118 changes: 59 additions & 59 deletions data/strings/FreeColMessages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ menuBar.debug.useAI=Use AI
# http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/KeyStroke.html#getKeyStroke%28java.lang.String%29

#!!!! Alert !!!!
# In early 2020 the _ja, _mk, _ru and _zh_CN translations are not fully
# In early 2021 the _ja, _mk, _ru and _zh_CN translations are not fully
# following the above requirement and consequently the keyboard accelerators
# are broken in the corresponding locales. Please: "control C" not "Ctrl+C",
# "NUMPAD6" not "Numpad 6" etc. Ctrl+C is *not* recognized as a valid
Expand Down Expand Up @@ -3319,7 +3319,7 @@ report.turn.playerNation=%player%'s {{tag:country|%nation%}}
# -14- Dialogs, Labels and Panels

# AboutPanel
aboutPanel.copyright=Copyright © 2002-2020 The FreeCol Team
aboutPanel.copyright=Copyright © 2002-2021 The FreeCol Team
aboutPanel.legalDisclaimer=FreeCol is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or any later version.
aboutPanel.manual=FreeCol Manual Download
aboutPanel.officialSite=Official site:
Expand Down Expand Up @@ -5426,9 +5426,9 @@ model.nation.french.region.land.4=Pays des Illinois
model.nation.french.region.land.5=Terre Neuve
model.nation.french.region.land.6=Canada
model.nation.french.region.land.7=Guyane
model.nation.french.region.land.8=Bas-Saint-Laurent
model.nation.french.region.land.9=Saguenay–Lac-Saint-Jean
model.nation.french.region.land.10=Mauricie
model.nation.french.region.land.8=Bas-Saint-Laurent
model.nation.french.region.land.9=Saguenay–Lac-Saint-Jean
model.nation.french.region.land.10=Mauricie
model.nation.french.region.land.11=Ottawa Valley
model.nation.french.region.land.12=Outaouais
model.nation.french.region.land.13=Pontiac
Expand All @@ -5438,11 +5438,11 @@ model.nation.french.region.land.16=Vallée-du-Haut-Saint-Laurent
model.nation.french.region.land.17=Beauce
model.nation.french.region.land.18=Bois-Francs
model.nation.french.region.land.19=Charlevoix
model.nation.french.region.land.20=Côte-Nord
model.nation.french.region.land.21=De la Baie-James
model.nation.french.region.land.22=De Longueuil
model.nation.french.region.land.23=Estrie
model.nation.french.region.land.24=Gaspésie–Îles-de-la-Madeleine
model.nation.french.region.land.20=Côte-Nord
model.nation.french.region.land.21=De la Baie-James
model.nation.french.region.land.22=De Longueuil
model.nation.french.region.land.23=Estrie
model.nation.french.region.land.24=Gaspésie–Îles-de-la-Madeleine
model.nation.french.region.land.25=Îles de la Madeleine
model.nation.french.region.land.26=Jamésie
model.nation.french.region.land.27=Kativik
Expand Down Expand Up @@ -5491,27 +5491,27 @@ model.nation.french.region.mountain.8=Monts Notre-Dame
model.nation.french.region.mountain.9=Massif du Mont-Mégantic
model.nation.french.region.mountain.10=Pic Champlain
model.nation.french.region.mountain.11=Mont Brome
model.nation.french.region.mountain.12=Mont D'Iberville
model.nation.french.region.mountain.12=Mont D'Iberville
model.nation.french.region.mountain.13=Mont Jacques-Cartier
model.nation.french.region.mountain.14=Mont Raoul Blanchard
model.nation.french.region.mountain.15=Mont Saint-Grégoire
model.nation.french.region.mountain.16=Mont Saint-Hilaire
model.nation.french.region.mountain.17=Mont Saint-Pierre
model.nation.french.region.mountain.18=Mont Tremblant
model.nation.french.region.mountain.19=Mont Wright
model.nation.french.region.mountain.19=Mont Wright
model.nation.french.region.mountain.20=Mont Yapeitso
model.nation.french.region.mountain.21=Mont Albert
model.nation.french.region.mountain.21=Mont Albert
model.nation.french.region.mountain.22=Mont Valin
model.nation.french.region.mountain.23=Mont Mégantic
model.nation.french.region.mountain.24=Mont Orford
model.nation.french.region.mountain.25=Mont Sutton
model.nation.french.region.mountain.26=Mont Saint-Pierre
model.nation.french.region.mountain.27=Mont des Pics
model.nation.french.region.mountain.28=Mont Xalibu
model.nation.french.region.mountain.29=Mont Joseph-Fortin
model.nation.french.region.mountain.30=Mont Olivine
model.nation.french.region.mountain.31=Mont Logan
model.nation.french.region.mountain.32=Mont Lyall
model.nation.french.region.mountain.26=Mont Saint-Pierre
model.nation.french.region.mountain.27=Mont des Pics
model.nation.french.region.mountain.28=Mont Xalibu
model.nation.french.region.mountain.29=Mont Joseph-Fortin
model.nation.french.region.mountain.30=Mont Olivine
model.nation.french.region.mountain.31=Mont Logan
model.nation.french.region.mountain.32=Mont Lyall

# French ship names
model.nation.french.ship.0=Grande Hermine
Expand Down Expand Up @@ -6166,28 +6166,28 @@ model.nation.spanish.region.land.6=Peru
model.nation.spanish.region.land.7=Honduras
model.nation.spanish.region.land.8=Bolivia
model.nation.spanish.region.land.9=Sonora
model.nation.spanish.region.land.10=Huehuetenango
model.nation.spanish.region.land.11=El Progreso
model.nation.spanish.region.land.12=Alta Verapaz
model.nation.spanish.region.land.13=Sacatepéquez
model.nation.spanish.region.land.10=Huehuetenango
model.nation.spanish.region.land.11=El Progreso
model.nation.spanish.region.land.12=Alta Verapaz
model.nation.spanish.region.land.13=Sacatepéquez
model.nation.spanish.region.land.14=Retalhuleu
model.nation.spanish.region.land.15=Yucatán
model.nation.spanish.region.land.16=Chimaltenango
model.nation.spanish.region.land.17=El Quiché
model.nation.spanish.region.land.18=San Marcos
model.nation.spanish.region.land.19=Santa Rosa
model.nation.spanish.region.land.16=Chimaltenango
model.nation.spanish.region.land.17=El Quiché
model.nation.spanish.region.land.18=San Marcos
model.nation.spanish.region.land.19=Santa Rosa
model.nation.spanish.region.land.20=Nueva Vizcaya
model.nation.spanish.region.land.21=Nuevo Santander
model.nation.spanish.region.land.22=Quetzaltenango
model.nation.spanish.region.land.23=Suchitepéquez
model.nation.spanish.region.land.22=Quetzaltenango
model.nation.spanish.region.land.23=Suchitepéquez
model.nation.spanish.region.land.24=Chiapas
model.nation.spanish.region.land.25=Nuevo Reino de León
model.nation.spanish.region.land.26=Chiquimula
model.nation.spanish.region.land.26=Chiquimula
model.nation.spanish.region.land.27=Guatemala
model.nation.spanish.region.land.28=Nueva Extremadura
model.nation.spanish.region.land.29=Sololá
model.nation.spanish.region.land.29=Sololá
model.nation.spanish.region.land.30=Las Californias
model.nation.spanish.region.land.31=Petén
model.nation.spanish.region.land.31=Petén
model.nation.spanish.region.land.32=Nuevo Reino de Granada
model.nation.spanish.region.land.33=Nueva Galicia

Expand Down Expand Up @@ -6251,7 +6251,7 @@ model.nation.spanish.region.mountain.23=Santa Isabel
model.nation.spanish.region.mountain.24=Puracé
model.nation.spanish.region.mountain.25=Sierra del Merendón
model.nation.spanish.region.mountain.26=Nevado El Cisne
model.nation.spanish.region.mountain.27=Pico Cristóbal Colón
model.nation.spanish.region.mountain.27=Pico Cristóbal Colón
model.nation.spanish.region.mountain.28=Nevado del Ruiz
model.nation.spanish.region.mountain.29=Nevado del Quindío
model.nation.spanish.region.mountain.30=Sierra del Lacandón
Expand Down Expand Up @@ -6688,41 +6688,41 @@ model.nation.danish.region.mountain.3=Petermann Bjerg
model.nation.danish.region.mountain.4=Valhaltinde
model.nation.danish.region.mountain.5=Savtakkerne
model.nation.danish.region.mountain.6=Rigny Bjerg
model.nation.danish.region.mountain.7=Mont Forel
model.nation.danish.region.mountain.8=Angelin Bjerg
model.nation.danish.region.mountain.7=Mont Forel
model.nation.danish.region.mountain.8=Angelin Bjerg
model.nation.danish.region.mountain.9=Avannaarsua
model.nation.danish.region.mountain.10=Agssaussat
model.nation.danish.region.mountain.10=Agssaussat
model.nation.danish.region.mountain.11=Traill Island
model.nation.danish.region.mountain.12=Agdleruussakasit
model.nation.danish.region.mountain.13=Qingagssat Qaqit
model.nation.danish.region.mountain.14=Klosterbjerge
model.nation.danish.region.mountain.15=Stauning Alper
model.nation.danish.region.mountain.16=Kloftbjerge
model.nation.danish.region.mountain.12=Agdleruussakasit
model.nation.danish.region.mountain.13=Qingagssat Qaqit
model.nation.danish.region.mountain.14=Klosterbjerge
model.nation.danish.region.mountain.15=Stauning Alper
model.nation.danish.region.mountain.16=Kloftbjerge
model.nation.danish.region.mountain.17=Nuussuaq
model.nation.danish.region.mountain.18=Patuersoq
model.nation.danish.region.mountain.18=Patuersoq
model.nation.danish.region.mountain.19=Hahn Land
model.nation.danish.region.mountain.20=Azimuthbjerg
model.nation.danish.region.mountain.21=Reval Toppen
model.nation.danish.region.mountain.22=Pyramiden
model.nation.danish.region.mountain.23=Margaretatopp
model.nation.danish.region.mountain.20=Azimuthbjerg
model.nation.danish.region.mountain.21=Reval Toppen
model.nation.danish.region.mountain.22=Pyramiden
model.nation.danish.region.mountain.23=Margaretatopp
model.nation.danish.region.mountain.24=Peary Land
model.nation.danish.region.mountain.25=Perserajoq
model.nation.danish.region.mountain.25=Perserajoq
model.nation.danish.region.mountain.26=Palup Qaqa
model.nation.danish.region.mountain.27=Ejnar Mikkelsen Fjeld
model.nation.danish.region.mountain.28=Paatuut
model.nation.danish.region.mountain.29=Svedenborg Bjerg
model.nation.danish.region.mountain.30=Hardersbjerg
model.nation.danish.region.mountain.27=Ejnar Mikkelsen Fjeld
model.nation.danish.region.mountain.28=Paatuut
model.nation.danish.region.mountain.29=Svedenborg Bjerg
model.nation.danish.region.mountain.30=Hardersbjerg
model.nation.danish.region.mountain.31=Storo
model.nation.danish.region.mountain.32=Payers Tinde
model.nation.danish.region.mountain.33=Johnstrup Bjerge
model.nation.danish.region.mountain.34=Appaalik
model.nation.danish.region.mountain.35=Snehaetten
model.nation.danish.region.mountain.32=Payers Tinde
model.nation.danish.region.mountain.33=Johnstrup Bjerge
model.nation.danish.region.mountain.34=Appaalik
model.nation.danish.region.mountain.35=Snehaetten
model.nation.danish.region.mountain.36=Renland
model.nation.danish.region.mountain.37=Berzelius Bjerg
model.nation.danish.region.mountain.37=Berzelius Bjerg
model.nation.danish.region.mountain.38=Gaaseland
model.nation.danish.region.mountain.39=Sukkertoppen
model.nation.danish.region.mountain.39=Sukkertoppen
model.nation.danish.region.mountain.40=Parnaqussuit Qavaat
model.nation.danish.region.mountain.41=Favres Bjerg
model.nation.danish.region.mountain.41=Favres Bjerg
model.nation.danish.region.mountain.42=Milne Land

# Danish ship names
Expand Down
Loading

0 comments on commit 0cdf8fe

Please sign in to comment.