Merge 1.9.0-beta2

2019-02-14 00:47:22 +03:00
parent c2d889eab3 2bda8d4f34
commit 6e2a54355a
1364 changed files with 22213 additions and 10721 deletions
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -1,4 +1,4 @@
-/* $Id: order_gui.cpp 27893 2017-08-13 18:38:42Z frosch $ */
+/* $Id$ */

 /*
 * This file is part of OpenTTD.
@@ -152,6 +152,7 @@ static const StringID _order_goto_dropdown_aircraft[] = {
 static const OrderConditionVariable _order_conditional_variable[] = {
 	OCV_LOAD_PERCENTAGE,
 	OCV_RELIABILITY,
+	OCV_MAX_RELIABILITY,
 	OCV_MAX_SPEED,
 	OCV_AGE,
 	OCV_REMAINING_LIFETIME,