Aurora.3/tools/mapmerge2/Resolve Map Conflicts.bat at TGSDMAPI - Aurora.3 - Gitea

cyberpresidentvanellope/Aurora.3

mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 03:21:13 +01:00

Files

T

Werner 3742231bc2 Major UT Overhaul (#16544 )

* Removes old UT definition files (drone/travis)
* Adds concurrency definitions to the workflows
* Changes our workflows to be more in line with what /tg does
* Adds a workflow to build/commit TGUI
* Adds a workflow to build/commit changelogs

Add python version to dependencies.sh
Fix dme errors
Removes a bunch of not included files
Cache Opendream and add directory to check_grep.py

Co-authored-by: Werner <Arrow768@users.noreply.github.com>

2023-06-27 16:44:16 +02:00

3 lines

84 B

Batchfile

Raw Permalink Blame History

	`@call "%~dp0\..\bootstrap\python.bat" -m mapmerge2.merge_driver --posthoc %*`
	`@pause`