Skip to content

FrogComposband#5740

Merged
Grimler91 merged 1 commit intotermux:masterfrom
Archenoth:frogcomposband
Aug 25, 2020
Merged

FrogComposband#5740
Grimler91 merged 1 commit intotermux:masterfrom
Archenoth:frogcomposband

Conversation

@Archenoth
Copy link
Copy Markdown
Contributor

So this was originally a PR for the game-packages repo, but because of Angband's pre-GPL licensing, this is now a pull request for the main repository!

The game itself is FrogComposband, an extremely content-rich roguelike in the Angband family with an overworld, a ridiculous amount of quests, unique classes, or just ways to play in general. It's also currently the most popular game played on angband.live.

This game is in the main repository due to the custom license that
Angband used to have that this project inherited
@Archenoth
Copy link
Copy Markdown
Contributor Author

Archenoth commented Aug 25, 2020

The force pushes are fighting with .gitattributes which kept converting the line endings of one of the patch files to LF instead of CRLF, causing one of the patches (And consequently the entire build) to fail.

Perhaps patch files should be set to text=binary so as to get git to handle patches as black boxes which may contain exact sequences of bytes it will never try to touch, since text=auto appears to rely on git guessing correctly about what to do with them.

@ghost
Copy link
Copy Markdown

ghost commented Aug 25, 2020

@Archenoth Ok, I will update .gitattributes.

@Archenoth
Copy link
Copy Markdown
Contributor Author

Yay! Thank you~

@Grimler91 Grimler91 merged commit 47ab962 into termux:master Aug 25, 2020
@Archenoth Archenoth deleted the frogcomposband branch August 25, 2020 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants