Merge pull request #820 from cazfi/srvup

Update to Freeciv server freeciv/freeciv@dbc33c19ab
freeciv · Mar 17, 2024 · fd8579e · fd8579e
2 parents beced78 + 03db369
commit fd8579e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/fc_types.js b/freeciv-web/src/main/webapp/javascript/fc_types.js
@@ -264,23 +264,25 @@ var ACTION_UNIT_MOVE3 = 111;
 var ACTION_TELEPORT = 112;
 var ACTION_TELEPORT2 = 113;
 var ACTION_TELEPORT3 = 114;
-var ACTION_TELEPORT_CONQUER=115;
-var ACTION_CLEAN = 116;
-var ACTION_COLLECT_RANSOM = 117;
-var ACTION_FORTIFY = 118;
-var ACTION_CULTIVATE = 119;
-var ACTION_CULTIVATE2 = 120;
-var ACTION_PLANT = 121;
-var ACTION_PLANT2 = 122;
-var ACTION_TRANSFORM_TERRAIN = 123;
-var ACTION_TRANSFORM_TERRAIN2 = 124;
+var ACTION_TELEPORT_CONQUER = 115;
+var ACTION_TELEPORT_ENTER = 116;
+var ACTION_TELEPORT_ENTER_CONQUER = 117;
+var ACTION_CLEAN = 118;
+var ACTION_COLLECT_RANSOM = 119;
+var ACTION_FORTIFY = 120;
+var ACTION_CULTIVATE = 121;
+var ACTION_CULTIVATE2 = 122;
+var ACTION_PLANT = 123;
+var ACTION_PLANT2 = 124;
+var ACTION_TRANSFORM_TERRAIN = 125;
+var ACTION_TRANSFORM_TERRAIN2 = 126;
 
-var ACTION_GAIN_VETERANCY = 125;
-var ACTION_USER_ACTION1 = 126;
-var ACTION_USER_ACTION2 = 127;
-var ACTION_USER_ACTION3 = 128;
-var ACTION_USER_ACTION4 = 129;
-var ACTION_COUNT = 130;
+var ACTION_GAIN_VETERANCY = 127;
+var ACTION_USER_ACTION1 = 128;
+var ACTION_USER_ACTION2 = 129;
+var ACTION_USER_ACTION3 = 130;
+var ACTION_USER_ACTION4 = 131;
+var ACTION_COUNT = 132;
 
 /* The action_decision enum */
 /* Doesn't need the player to decide what action to take. */
@@ -350,7 +352,8 @@ var VUT_WRAP = 54;
 var VUT_PLAYER_FLAG = 55;
 var VUT_PLAYER_STATE = 56;
 var VUT_FORM_AGE = 57;
-var VUT_COUNT = 58;             /* Keep this last. */
+var VUT_MINCITIES = 58;
+var VUT_COUNT = 59;             /* Keep this last. */
 
 /* Freeciv's gui_type enum */
 /* GUI_STUB used for options which do not belong to any gui. */

diff --git a/freeciv/version.txt b/freeciv/version.txt
@@ -1,9 +1,9 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=2fc0e48cb9f9344af208cfde5b10bf5a89db785a
+FCREV=dbc33c19ab3b545d406d266e606c5007ad2ce2b6
 
-ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Jan.14"
+ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Jan.22"
 
 # There's no need to bump this constantly as current freeciv-web
 # makes no connections to outside world - all connections are