From bfd431530c66fdd9f2783818d0d93c034b87f104 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 12 Apr 2022 22:01:10 +0300
Subject: [PATCH 30/30] Reorder the actions enum so that the user actions are
 last

See osdn #44103

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 common/actions.h | 100 +++++++++++++++++++++++------------------------
 fc_version       |   2 +-
 2 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/common/actions.h b/common/actions.h
index 1ec10497e9..62e3e88627 100644
--- a/common/actions.h
+++ b/common/actions.h
@@ -228,56 +228,56 @@ const char *gen_action_name_update_cb(const char *old_name);
 #define SPECENUM_VALUE79NAME "Frighten Hut 2"
 #define SPECENUM_VALUE80 ACTION_UNIT_MOVE
 #define SPECENUM_VALUE80NAME "Unit Move"
-#define SPECENUM_VALUE81 ACTION_USER_ACTION1
-#define SPECENUM_VALUE81NAME "User Action 1"
-#define SPECENUM_VALUE82 ACTION_USER_ACTION2
-#define SPECENUM_VALUE82NAME "User Action 2"
-#define SPECENUM_VALUE83 ACTION_USER_ACTION3
-#define SPECENUM_VALUE83NAME "User Action 3"
-#define SPECENUM_VALUE84 ACTION_USER_ACTION4
-#define SPECENUM_VALUE84NAME "User Action 4"
-#define SPECENUM_VALUE85 ACTION_HEAL_UNIT2
-#define SPECENUM_VALUE85NAME "Heal Unit 2"
-#define SPECENUM_VALUE86 ACTION_CONQUER_CITY3
-#define SPECENUM_VALUE86NAME "Conquer City 3"
-#define SPECENUM_VALUE87 ACTION_CONQUER_CITY4
-#define SPECENUM_VALUE87NAME "Conquer City 4"
-#define SPECENUM_VALUE88 ACTION_CONQUER_EXTRAS3
-#define SPECENUM_VALUE88NAME "Conquer Extras 3"
-#define SPECENUM_VALUE89 ACTION_CONQUER_EXTRAS4
-#define SPECENUM_VALUE89NAME "Conquer Extras 4"
-#define SPECENUM_VALUE90 ACTION_TRANSPORT_DISEMBARK3
-#define SPECENUM_VALUE90NAME "Transport Disembark 3"
-#define SPECENUM_VALUE91 ACTION_TRANSPORT_DISEMBARK4
-#define SPECENUM_VALUE91NAME "Transport Disembark 4"
-#define SPECENUM_VALUE92 ACTION_TRANSPORT_EMBARK2
-#define SPECENUM_VALUE92NAME "Transport Embark 2"
-#define SPECENUM_VALUE93 ACTION_TRANSPORT_EMBARK3
-#define SPECENUM_VALUE93NAME "Transport Embark 3"
-#define SPECENUM_VALUE94 ACTION_HUT_ENTER3
-#define SPECENUM_VALUE94NAME "Enter Hut 3"
-#define SPECENUM_VALUE95 ACTION_HUT_ENTER4
-#define SPECENUM_VALUE95NAME "Enter Hut 4"
-#define SPECENUM_VALUE96 ACTION_HUT_FRIGHTEN3
-#define SPECENUM_VALUE96NAME "Frighten Hut 3"
-#define SPECENUM_VALUE97 ACTION_HUT_FRIGHTEN4
-#define SPECENUM_VALUE97NAME "Frighten Hut 4"
-#define SPECENUM_VALUE98 ACTION_UNIT_MOVE2
-#define SPECENUM_VALUE98NAME "Unit Move 2"
-#define SPECENUM_VALUE99 ACTION_UNIT_MOVE3
-#define SPECENUM_VALUE99NAME "Unit Move 3"
-#define SPECENUM_VALUE100 ACTION_PARADROP_CONQUER
-#define SPECENUM_VALUE100NAME "Paradrop Unit Conquer"
-#define SPECENUM_VALUE101 ACTION_PARADROP_FRIGHTEN
-#define SPECENUM_VALUE101NAME "Paradrop Unit Frighten"
-#define SPECENUM_VALUE102 ACTION_PARADROP_FRIGHTEN_CONQUER
-#define SPECENUM_VALUE102NAME "Paradrop Unit Frighten Conquer"
-#define SPECENUM_VALUE103 ACTION_PARADROP_ENTER
-#define SPECENUM_VALUE103NAME "Paradrop Unit Enter"
-#define SPECENUM_VALUE104 ACTION_PARADROP_ENTER_CONQUER
-#define SPECENUM_VALUE104NAME "Paradrop Unit Enter Conquer"
-#define SPECENUM_VALUE105 ACTION_HOMELESS
-#define SPECENUM_VALUE105NAME "Unit Make Homeless"
+#define SPECENUM_VALUE81 ACTION_HEAL_UNIT2
+#define SPECENUM_VALUE81NAME "Heal Unit 2"
+#define SPECENUM_VALUE82 ACTION_CONQUER_CITY3
+#define SPECENUM_VALUE82NAME "Conquer City 3"
+#define SPECENUM_VALUE83 ACTION_CONQUER_CITY4
+#define SPECENUM_VALUE83NAME "Conquer City 4"
+#define SPECENUM_VALUE84 ACTION_CONQUER_EXTRAS3
+#define SPECENUM_VALUE84NAME "Conquer Extras 3"
+#define SPECENUM_VALUE85 ACTION_CONQUER_EXTRAS4
+#define SPECENUM_VALUE85NAME "Conquer Extras 4"
+#define SPECENUM_VALUE86 ACTION_TRANSPORT_DISEMBARK3
+#define SPECENUM_VALUE86NAME "Transport Disembark 3"
+#define SPECENUM_VALUE87 ACTION_TRANSPORT_DISEMBARK4
+#define SPECENUM_VALUE87NAME "Transport Disembark 4"
+#define SPECENUM_VALUE88 ACTION_TRANSPORT_EMBARK2
+#define SPECENUM_VALUE88NAME "Transport Embark 2"
+#define SPECENUM_VALUE89 ACTION_TRANSPORT_EMBARK3
+#define SPECENUM_VALUE89NAME "Transport Embark 3"
+#define SPECENUM_VALUE90 ACTION_HUT_ENTER3
+#define SPECENUM_VALUE90NAME "Enter Hut 3"
+#define SPECENUM_VALUE91 ACTION_HUT_ENTER4
+#define SPECENUM_VALUE91NAME "Enter Hut 4"
+#define SPECENUM_VALUE92 ACTION_HUT_FRIGHTEN3
+#define SPECENUM_VALUE92NAME "Frighten Hut 3"
+#define SPECENUM_VALUE93 ACTION_HUT_FRIGHTEN4
+#define SPECENUM_VALUE93NAME "Frighten Hut 4"
+#define SPECENUM_VALUE94 ACTION_UNIT_MOVE2
+#define SPECENUM_VALUE94NAME "Unit Move 2"
+#define SPECENUM_VALUE95 ACTION_UNIT_MOVE3
+#define SPECENUM_VALUE95NAME "Unit Move 3"
+#define SPECENUM_VALUE96 ACTION_PARADROP_CONQUER
+#define SPECENUM_VALUE96NAME "Paradrop Unit Conquer"
+#define SPECENUM_VALUE97 ACTION_PARADROP_FRIGHTEN
+#define SPECENUM_VALUE97NAME "Paradrop Unit Frighten"
+#define SPECENUM_VALUE98 ACTION_PARADROP_FRIGHTEN_CONQUER
+#define SPECENUM_VALUE98NAME "Paradrop Unit Frighten Conquer"
+#define SPECENUM_VALUE99 ACTION_PARADROP_ENTER
+#define SPECENUM_VALUE99NAME "Paradrop Unit Enter"
+#define SPECENUM_VALUE100 ACTION_PARADROP_ENTER_CONQUER
+#define SPECENUM_VALUE100NAME "Paradrop Unit Enter Conquer"
+#define SPECENUM_VALUE101 ACTION_HOMELESS
+#define SPECENUM_VALUE101NAME "Unit Make Homeless"
+#define SPECENUM_VALUE102 ACTION_USER_ACTION1
+#define SPECENUM_VALUE102NAME "User Action 1"
+#define SPECENUM_VALUE103 ACTION_USER_ACTION2
+#define SPECENUM_VALUE103NAME "User Action 2"
+#define SPECENUM_VALUE104 ACTION_USER_ACTION3
+#define SPECENUM_VALUE104NAME "User Action 3"
+#define SPECENUM_VALUE105 ACTION_USER_ACTION4
+#define SPECENUM_VALUE105NAME "User Action 4"
 #define SPECENUM_BITVECTOR bv_actions
 #define SPECENUM_COUNT ACTION_COUNT
 #define SPECENUM_NAME_UPDATER
diff --git a/fc_version b/fc_version
index 5608bfbe15..33f8075fb1 100755
--- a/fc_version
+++ b/fc_version
@@ -56,7 +56,7 @@ DEFAULT_FOLLOW_TAG=S3_1
 #   - No new mandatory capabilities can be added to the release branch; doing
 #     so would break network capability of supposedly "compatible" releases.
 #
-NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2022.Apr.09b"
+NETWORK_CAPSTRING="+Freeciv.Devel-3.1-2022.Apr.12"
 
 FREECIV_DISTRIBUTOR=""
 
-- 
2.35.1