Skip to content

[pull] master from mapeditor:master - #109

Merged
pull[bot] merged 3 commits into
dogboydog:masterfrom
mapeditor:master
Jul 1, 2026
Merged

pull[bot] merged 3 commits into
dogboydog:masterfrom
mapeditor:master

Conversation

@pull

@pull pull Bot commented Jul 1, 2026 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

bjorn and others added 3 commits July 1, 2026 18:28
Split the combined "Doxygen and Sphinx" section and note that the html/
rule is for Doxygen's output.

Only the .pot files under docs/_build/gettext are meant to be tracked, but
the gettext builder writes other output (static asset dirs) alongside them.
Ignore everything under docs/_build/gettext except the .pot sources.

Remove orphaned sphinx.pot and its translations, stale since f21a6b9
("docs: Use the sphinx-docsearch extension").
* Add manual section for resizing maps and the world grid
* Give the world grid its own section and update the resize section
* Annotate new 1.13 world features in the manual
* Exclude .venv from Sphinx source scanning

Co-authored-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
This updates the mime database and the desktop file to add suport for:
 - .tmj: Tiled map json files
 - .tsj: Tiled tileset json files
 - .tiled-project: Tiled project files
 - .world: Tiled world files

Closes #4523
@pull pull Bot locked and limited conversation to collaborators Jul 1, 2026
@pull pull Bot added the ⤵️ pull label Jul 1, 2026
@pull
pull Bot merged commit 2049d98 into dogboydog:master Jul 1, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants