Merge branch 'master' into jgrpp

This commit is contained in:
Jonathan G Rennison
2021-04-05 17:50:39 +01:00
164 changed files with 3493 additions and 2443 deletions

View File

@@ -91,4 +91,4 @@ const byte _openttd_revision_tagged = ${REV_ISTAG};
* version, thus making comparisons on specific revisions easy.
*/
/** ${REV_ISSTABLETAG} removed */
const uint32 _openttd_newgrf_version = 1 << 28 | 11 << 24 | 0 << 20 | 0 << 19 | 28004;
const uint32 _openttd_newgrf_version = 1 << 28 | 12 << 24 | 0 << 20 | 0 << 19 | 28004;