Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Freeciv server freeciv/freeciv@a99f180e6e #818

Merged
merged 1 commit into from
Mar 9, 2024
Merged

Update to Freeciv server freeciv/freeciv@a99f180e6e #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions freeciv-web/src/main/webapp/javascript/fc_types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,15 +269,18 @@ var ACTION_CLEAN = 116;
var ACTION_COLLECT_RANSOM = 117;
var ACTION_FORTIFY = 118;
var ACTION_CULTIVATE = 119;
var ACTION_PLANT = 120;
var ACTION_TRANSFORM_TERRAIN = 121;
var ACTION_CULTIVATE2 = 120;
var ACTION_PLANT = 121;
var ACTION_PLANT2 = 122;
var ACTION_TRANSFORM_TERRAIN = 123;
var ACTION_TRANSFORM_TERRAIN2 = 124;

var ACTION_GAIN_VETERANCY = 122;
var ACTION_USER_ACTION1 = 123;
var ACTION_USER_ACTION2 = 124;
var ACTION_USER_ACTION3 = 125;
var ACTION_USER_ACTION4 = 126;
var ACTION_COUNT = 127;
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;

/* The action_decision enum */
/* Doesn't need the player to decide what action to take. */
Expand Down
4 changes: 2 additions & 2 deletions freeciv/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# The Git SHA hash for the commit to checkout from
# https://github.com/freeciv/freeciv

FCREV=9849a50d64bb81d23795ef6602bb58e98e294391
FCREV=a99f180e6ede9c69e6180f1ed4f18b62bd7291bb

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Jan.10"
ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Jan.14"

# There's no need to bump this constantly as current freeciv-web
# makes no connections to outside world - all connections are
Expand Down
Loading