Merge pull request #827 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@1e5a41a0b6

freeciv-web/src/main/webapp/javascript/fc_types.js

@@ -270,22 +270,23 @@ var ACTION_TELEPORT_FRIGHTEN_CONQUER = 117;
 var ACTION_TELEPORT_ENTER = 118;
 var ACTION_TELEPORT_ENTER_CONQUER = 119;
 var ACTION_CLEAN = 120;
-var ACTION_COLLECT_RANSOM = 121;
-var ACTION_FORTIFY = 122;
-var ACTION_FORTIFY2 = 123;
-var ACTION_CULTIVATE = 124;
-var ACTION_CULTIVATE2 = 125;
-var ACTION_PLANT = 126;
-var ACTION_PLANT2 = 127;
-var ACTION_TRANSFORM_TERRAIN = 128;
-var ACTION_TRANSFORM_TERRAIN2 = 129;
+var ACTION_CLEAN2 = 121;
+var ACTION_COLLECT_RANSOM = 122;
+var ACTION_FORTIFY = 123;
+var ACTION_FORTIFY2 = 124;
+var ACTION_CULTIVATE = 125;
+var ACTION_CULTIVATE2 = 126;
+var ACTION_PLANT = 127;
+var ACTION_PLANT2 = 128;
+var ACTION_TRANSFORM_TERRAIN = 129;
+var ACTION_TRANSFORM_TERRAIN2 = 130;
 
-var ACTION_GAIN_VETERANCY = 130;
-var ACTION_USER_ACTION1 = 131;
-var ACTION_USER_ACTION2 = 132;
-var ACTION_USER_ACTION3 = 133;
-var ACTION_USER_ACTION4 = 134;
-var ACTION_COUNT = 135;
+var ACTION_GAIN_VETERANCY = 131;
+var ACTION_USER_ACTION1 = 132;
+var ACTION_USER_ACTION2 = 133;
+var ACTION_USER_ACTION3 = 134;
+var ACTION_USER_ACTION4 = 135;
+var ACTION_COUNT = 136;
 
 /* The action_decision enum */
 /* Doesn't need the player to decide what action to take. */

freeciv/version.txt

@@ -1,9 +1,9 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=3540ac55eee1306701221fa4d4709ac1b521b4da
+FCREV=1e5a41a0b62300f822963ada93fef2a7cb388b93
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Feb.07"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Feb.22"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are