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@95e975300e #855

Merged
merged 1 commit into from
Jun 6, 2024
Merged

Update to Freeciv server freeciv/freeciv@95e975300e #855

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
8 changes: 0 additions & 8 deletions freeciv/apply_patches.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@
# https://osdn.net/projects/freeciv/ticket/?????
# https://redmine.freeciv.org/issues/???
#
# 0050-savegame-Fix-loading-invalid-resources-on-FoW-map.patch
# Savegame resources loading fix
# RM #463
# 0049-Trigger-action-system-when-client-requests-activity-.patch
# Activity action fix (esp. Pillage)
# osdn #57670
# 0048-Handle-CoastStrict-units-correctly-on-city-removal.patch
# Fix to unit placement after city destruction
# RM #525
Expand Down Expand Up @@ -59,8 +53,6 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0050-savegame-Fix-loading-invalid-resources-on-FoW-map"
"backports/0049-Trigger-action-system-when-client-requests-activity-"
"backports/0048-Handle-CoastStrict-units-correctly-on-city-removal"
"backports/0061-savegame-Correct-loading-last-turn-change-time"
"backports/0073-savecompat-Fix-adding-ACTION_NONE-actions-for-units-"
Expand Down
44 changes: 0 additions & 44 deletions freeciv/patches/backports/0049-Trigger-action-system-when-client-requests-activity-.patch
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions freeciv/patches/backports/0050-savegame-Fix-loading-invalid-resources-on-FoW-map.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion freeciv/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# The Git SHA hash for the commit to checkout from
# https://github.com/freeciv/freeciv

FCREV=3c41f4e1ac25fe1ff8b383740ebabfe044907c0b
FCREV=95e975300e39ba90c8a561d6cfef5f64f8e490f2

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Apr.30"

Expand Down
Loading