From 4a943b01f24c70d74fbaf6f9b4438861fb377114 Mon Sep 17 00:00:00 2001 From: Blixibon Date: Mon, 6 May 2019 01:16:03 -0500 Subject: [PATCH] Added conflicts page --- Entity-List.md | 2 +- Merging/Conflicts.md | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 Merging/Conflicts.md diff --git a/Entity-List.md b/Entity-List.md index c0c83ad..00c7a4e 100644 --- a/Entity-List.md +++ b/Entity-List.md @@ -339,7 +339,7 @@ There is most likely some information missing or miscellaneous stuff left out, b | npc_advisor | :heavy_minus_sign: | | | npc_alyx | :twisted_rightwards_arrows: | Inherits all companion changes, see npc_citizen. | | npc_antlion | :twisted_rightwards_arrows: | Dynamic interactions restored (set by mapper), new global state for disabling soldier insta-kill, attempted better bugbait support for workers | -| npc_antlion_grub | :twisted_rightwards_arrows: | Now allows a damage filter which can control whether this entity is allowed to be squashed. | +| npc_antlion_grub | :twisted_rightwards_arrows: | Now allows a damage filter which can control whether this grub is allowed to be squashed. | | npc_antlion_template_maker | :heavy_minus_sign: | | | npc_antlionguard | :heavy_minus_sign: | | | npc_apcdriver | :heavy_minus_sign: | | diff --git a/Merging/Conflicts.md b/Merging/Conflicts.md new file mode 100644 index 0000000..902e041 --- /dev/null +++ b/Merging/Conflicts.md @@ -0,0 +1,3 @@ +Although we tried to make Mapbase easy to merge with Git, conflicts can occur. + +(mention things like the VDC fixes and other common features that might be implemented in other mods, and just changes to places where mods can make their own changes) \ No newline at end of file