Merge branch 'master' into jgrpp

# Conflicts:
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/saveload/saveload.h
This commit is contained in:
Jonathan G Rennison
2023-01-02 01:23:36 +00:00
13 changed files with 31 additions and 8 deletions

View File

@@ -13,10 +13,12 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 13.0
* \b 14.0
*
* This version is not yet released. The following changes are not set in stone yet.
*
* \b 13.0
*
* API additions:
* \li AICargo::GetWeight
* \li AIIndustryType::ResolveNewGRFID

View File

@@ -13,10 +13,12 @@
* functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut.
*
* \b 13.0
* \b 14.0
*
* This version is not yet released. The following changes are not set in stone yet.
*
* \b 13.0
*
* API additions:
* \li GSCargo::GetWeight
* \li GSIndustryType::ResolveNewGRFID