Khopa cf583bcd55 Merge branch 'master' into develop ...

# Conflicts:
#	changelog.md
#	game/db.py
#	game/game.py
#	game/income.py
#	game/theater/theatergroundobject.py
#	game/version.py
#	qt_ui/windows/finances/QFinancesMenu.py

2021-01-05 19:50:29 +01:00

..

allies_1944_free.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

allies_1944.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

australia_2005.json

Put manpads in modern faction's infantry squads. And added a setting to disable it.

2020-11-29 13:11:49 +01:00

bluefor_coldwar_a4_mb339.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

bluefor_coldwar_a4.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

bluefor_coldwar.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

bluefor_modern.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

canada_2005.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

china_2010.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

france_1995.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

france_2005_frenchpack.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

france_2005_modded.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

georgia_2008.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

germany_1942.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

germany_1944_free.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

germany_1944.json

Changelog update, WW2 factions can recruit AA/AT guns for frontlines.

2020-12-23 18:21:13 +01:00

germany_1990.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

greece_2005.json

Update Greece faction with comments.

2021-01-05 10:12:46 +00:00

india_2010.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

insurgents_hard.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

insurgents_modded.json

Put manpads in modern faction's infantry squads. And added a setting to disable it.

2020-11-29 13:11:49 +01:00

insurgents.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

iran_2015.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

iraq_1991.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

israel_1948.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

israel_1973.json

Also add the E-2C to Israel and Japan.

2021-01-05 02:36:08 -08:00

israel_1982.json

Also add the E-2C to Israel and Japan.

2021-01-05 02:36:08 -08:00

israel_2000.json

Also add the E-2C to Israel and Japan.

2021-01-05 02:36:08 -08:00

italy_1990_mb339.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

italy_1990.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

japan_2005.json

Also add the E-2C to Israel and Japan.

2021-01-05 02:36:08 -08:00

libya_2011.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

NATO_Desert_Storm.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

netherlands_1990.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

north_korea_2000.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

pakistan_2015.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

pmc_russian.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

pmc_us_with_mb339.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

pmc_us.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

poland_2010.json

Adds a 2010-ish Poland faction. (#713)

2021-01-05 02:31:49 -08:00

russia_1955.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

russia_1965.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

russia_1970_limited_air.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

russia_1975.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

russia_1990.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

russia_2010.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

russia_2020.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

soviet_union_1943.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

spain_1990.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

sweden_1970.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

sweden_1990.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

syria_1948.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

syria_1967_with_ww2_weapons.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

syria_1967.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

syria_1973.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

syria_1982.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

syria_2011.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

turkey_2005.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

uae_2005.json

Put manpads in modern faction's infantry squads. And added a setting to disable it.

2020-11-29 13:11:49 +01:00

uk_1944.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

uk_1990.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

ukraine_2010.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

us_aggressors.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

usa_1944.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

usa_1955.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

usa_1960.json

Added shorad units on frontline

2020-12-22 23:23:32 +01:00

usa_1965.json

Use E-2C Hawkeye for US faction between 1964-1977.

2021-01-05 02:36:08 -08:00

usa_1975.json

Use E-2C Hawkeye for US faction between 1964-1977.

2021-01-05 02:36:08 -08:00

usa_1990.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

usa_2005_c130.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

usa_2005_modded.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

usa_2005.json

Infantry squads can contain a mortar.

2020-12-23 17:53:52 +01:00

usn_1985.json

Merge branch 'master' into develop

2021-01-05 19:50:29 +01:00