cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Manualbiome (#11216)

Browse Source
This commit is contained in:
Kashargul
2025-07-21 22:37:45 +02:00
committed by GitHub
parent afa0b4bfdb
commit f39fdae47c
280 changed files with 18208 additions and 17558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/mapmerge2/readme.md
View File

@@ -16,8 +16,8 @@ To install the [Git hooks], open the `tools/hooks/` folder and double-click
If using a Git GUI which is not compatible with the hooks:
* Before committing, double-click `Run Before Committing.bat`
* When a merge has map conflicts, double-click `Resolve Map Conflicts.bat`
- Before committing, double-click `Run Before Committing.bat`
- When a merge has map conflicts, double-click `Resolve Map Conflicts.bat`
The console will show whether the operation succeeded.
@@ -44,16 +44,16 @@ the map root is autodetected. Each script may either prompt for the desired map
or be run with command-line parameters indicating which maps to act on. The
scripts include:
* `convert.py` for converting maps to and from the TGM format. Used by
- `convert.py` for converting maps to and from the TGM format. Used by
`tgm2dmm.bat` and `dmm2tgm.bat`.
* `mapmerge.py` for running the map merge on map backups saved by
- `mapmerge.py` for running the map merge on map backups saved by
`Prepare Maps.bat`. Used by `mapmerge.bat`
Implementation modules:
* `dmm.py` includes the map reader and writer.
* `mapmerge.py` includes the implementation of the map merge operation.
* `frontend.py` includes the common code for the frontend scripts.
- `dmm.py` includes the map reader and writer.
- `mapmerge.py` includes the implementation of the map merge operation.
- `frontend.py` includes the common code for the frontend scripts.
`precommit.py` is run by the [Git hooks] if installed, and merges the new
version of any map saved in the index (`git add`ed) with the old version stored